1 Submitted By: Matthew Burgess (matthew at linuxfromscratch dot org)
3 Initial Package Version: 5.1
4 Origin: http://ftp.gnu.org/gnu/readline/readline-5.1-patches/
5 Upstream Status: From Upstream
6 Description: Contains Patch 001-004 from Upstream
8 diff -Naur readline-5.1.orig/display.c readline-5.1/display.c
9 --- readline-5.1.orig/display.c 2005-11-30 19:05:02.000000000 +0000
10 +++ readline-5.1/display.c 2006-03-17 16:03:09.000000000 +0000
11 @@ -1983,11 +1983,15 @@
20 - if (saved_local_prompt == 0)
21 + /* We've saved the prompt, and can do anything with the various prompt
22 + strings we need before they're restored. We want the unexpanded
23 + portion of the prompt string after any final newline. */
24 + p = rl_prompt ? strrchr (rl_prompt, '\n') : 0;
27 len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
28 pmt = (char *)xmalloc (len + 2);
29 @@ -1998,19 +2002,17 @@
33 - len = *saved_local_prompt ? strlen (saved_local_prompt) : 0;
36 pmt = (char *)xmalloc (len + 2);
38 - strcpy (pmt, saved_local_prompt);
42 - local_prompt = savestring (pmt);
43 - prompt_last_invisible = saved_last_invisible;
44 - prompt_visible_length = saved_visible_length + 1;
48 + /* will be overwritten by expand_prompt, called from rl_message */
49 prompt_physical_chars = saved_physical_chars + 1;
54 diff -Naur readline-5.1.orig/readline.c readline-5.1/readline.c
55 --- readline-5.1.orig/readline.c 2005-07-05 02:29:35.000000000 +0000
56 +++ readline-5.1/readline.c 2006-03-17 16:03:05.000000000 +0000
60 rl_prompt = prompt ? savestring (prompt) : (char *)NULL;
61 + rl_display_prompt = rl_prompt ? rl_prompt : "";
63 rl_visible_prompt_length = rl_expand_prompt (rl_prompt);
68 RL_SETSTATE(RL_STATE_DISPATCHING);
69 - r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
70 + (*map[key].function)(rl_numeric_arg * rl_arg_sign, key);
71 RL_UNSETSTATE(RL_STATE_DISPATCHING);
74 diff -Naur readline-5.1.orig/terminal.c readline-5.1/terminal.c
75 --- readline-5.1.orig/terminal.c 2005-11-13 01:46:54.000000000 +0000
76 +++ readline-5.1/terminal.c 2006-03-17 16:03:02.000000000 +0000
78 static char *_rl_visible_bell;
80 /* Non-zero means the terminal can auto-wrap lines. */
81 -int _rl_term_autowrap;
82 +int _rl_term_autowrap = -1;
84 /* Non-zero means that this terminal has a meta key. */
85 static int term_has_meta;
87 _rl_set_screen_size (rows, cols)
90 + if (_rl_term_autowrap == -1)
91 + _rl_init_terminal_io (rl_terminal_name);
94 _rl_screenheight = rows;
96 diff -Naur readline-5.1.orig/text.c readline-5.1/text.c
97 --- readline-5.1.orig/text.c 2005-09-24 23:06:07.000000000 +0000
98 +++ readline-5.1/text.c 2006-03-17 16:02:58.000000000 +0000
100 rl_delete (count, key)
106 return (_rl_rubout_char (-count, key));
108 @@ -1090,17 +1088,17 @@
110 rl_forward_byte (count, key);
112 - r = rl_kill_text (orig_point, rl_point);
113 + rl_kill_text (orig_point, rl_point);
114 rl_point = orig_point;
121 new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO);
122 - return (rl_delete_text (rl_point, new_point));
123 + rl_delete_text (rl_point, new_point);
128 /* Delete the character under the cursor, unless the insertion