source:
patches/readline-5.1-fixes-3.patch@
d1e7a164
Last change on this file since d1e7a164 was 69cde8d, checked in by , 19 years ago | |
---|---|
|
|
File size: 3.7 KB |
-
TabularUnified readline-5.1
Submitted By: Matthew Burgess (matthew at linuxfromscratch dot org) Date: 2006-03-17 Initial Package Version: 5.1 Origin: http://ftp.gnu.org/gnu/readline/readline-5.1-patches/ Upstream Status: From Upstream Description: Contains Patch 001-004 from Upstream diff -Naur readline-5.1.orig/display.c readline-5.1/display.c
old new 1983 1983 int pchar; 1984 1984 { 1985 1985 int len; 1986 char *pmt ;1986 char *pmt, *p; 1987 1987 1988 1988 rl_save_prompt (); 1989 1989 1990 if (saved_local_prompt == 0) 1990 /* We've saved the prompt, and can do anything with the various prompt 1991 strings we need before they're restored. We want the unexpanded 1992 portion of the prompt string after any final newline. */ 1993 p = rl_prompt ? strrchr (rl_prompt, '\n') : 0; 1994 if (p == 0) 1991 1995 { 1992 1996 len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; 1993 1997 pmt = (char *)xmalloc (len + 2); … … 1998 2002 } 1999 2003 else 2000 2004 { 2001 len = *saved_local_prompt ? strlen (saved_local_prompt) : 0; 2005 p++; 2006 len = strlen (p); 2002 2007 pmt = (char *)xmalloc (len + 2); 2003 2008 if (len) 2004 strcpy (pmt, saved_local_prompt);2009 strcpy (pmt, p); 2005 2010 pmt[len] = pchar; 2006 2011 pmt[len+1] = '\0'; 2007 local_prompt = savestring (pmt); 2008 prompt_last_invisible = saved_last_invisible; 2009 prompt_visible_length = saved_visible_length + 1; 2010 } 2012 } 2011 2013 2014 /* will be overwritten by expand_prompt, called from rl_message */ 2012 2015 prompt_physical_chars = saved_physical_chars + 1; 2013 2014 2016 return pmt; 2015 2017 } 2016 2018 -
TabularUnified readline-5.1
diff -Naur readline-5.1.orig/readline.c readline-5.1/readline.c
old new 282 282 { 283 283 FREE (rl_prompt); 284 284 rl_prompt = prompt ? savestring (prompt) : (char *)NULL; 285 rl_display_prompt = rl_prompt ? rl_prompt : ""; 285 286 286 287 rl_visible_prompt_length = rl_expand_prompt (rl_prompt); 287 288 return 0; … … 714 715 715 716 rl_dispatching = 1; 716 717 RL_SETSTATE(RL_STATE_DISPATCHING); 717 r =(*map[key].function)(rl_numeric_arg * rl_arg_sign, key);718 (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); 718 719 RL_UNSETSTATE(RL_STATE_DISPATCHING); 719 720 rl_dispatching = 0; 720 721 -
TabularUnified readline-5.1
diff -Naur readline-5.1.orig/terminal.c readline-5.1/terminal.c
old new 122 122 static char *_rl_visible_bell; 123 123 124 124 /* Non-zero means the terminal can auto-wrap lines. */ 125 int _rl_term_autowrap ;125 int _rl_term_autowrap = -1; 126 126 127 127 /* Non-zero means that this terminal has a meta key. */ 128 128 static int term_has_meta; … … 274 274 _rl_set_screen_size (rows, cols) 275 275 int rows, cols; 276 276 { 277 if (_rl_term_autowrap == -1) 278 _rl_init_terminal_io (rl_terminal_name); 279 277 280 if (rows > 0) 278 281 _rl_screenheight = rows; 279 282 if (cols > 0) -
TabularUnified readline-5.1
diff -Naur readline-5.1.orig/text.c readline-5.1/text.c
old new 1071 1071 rl_delete (count, key) 1072 1072 int count, key; 1073 1073 { 1074 int r;1075 1076 1074 if (count < 0) 1077 1075 return (_rl_rubout_char (-count, key)); 1078 1076 … … 1090 1088 else 1091 1089 rl_forward_byte (count, key); 1092 1090 1093 r = rl_kill_text (orig_point, rl_point);1091 rl_kill_text (orig_point, rl_point); 1094 1092 rl_point = orig_point; 1095 return r;1096 1093 } 1097 1094 else 1098 1095 { 1099 1096 int new_point; 1100 1097 1101 1098 new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO); 1102 r eturn (rl_delete_text (rl_point, new_point));1099 rl_delete_text (rl_point, new_point); 1103 1100 } 1101 return 0; 1104 1102 } 1105 1103 1106 1104 /* Delete the character under the cursor, unless the insertion
Note:
See TracBrowser
for help on using the repository browser.