diff options
author | ache <ache@FreeBSD.org> | 2006-03-27 23:45:09 +0000 |
---|---|---|
committer | ache <ache@FreeBSD.org> | 2006-03-27 23:45:09 +0000 |
commit | 4769b932e563148509f0827d83ed3c3c09e557c9 (patch) | |
tree | f9fd6c147665c88c88878d3f58b8a004318586fb /contrib/libreadline | |
parent | 8aeb9782f4a5d98c23b918bdae2477810088d0d1 (diff) | |
download | FreeBSD-src-4769b932e563148509f0827d83ed3c3c09e557c9.zip FreeBSD-src-4769b932e563148509f0827d83ed3c3c09e557c9.tar.gz |
Official patches 001-004
Diffstat (limited to 'contrib/libreadline')
-rw-r--r-- | contrib/libreadline/display.c | 20 | ||||
-rw-r--r-- | contrib/libreadline/readline.c | 3 | ||||
-rw-r--r-- | contrib/libreadline/terminal.c | 5 | ||||
-rw-r--r-- | contrib/libreadline/text.c | 8 |
4 files changed, 20 insertions, 16 deletions
diff --git a/contrib/libreadline/display.c b/contrib/libreadline/display.c index b22521b..0d3ae6e 100644 --- a/contrib/libreadline/display.c +++ b/contrib/libreadline/display.c @@ -1983,11 +1983,15 @@ _rl_make_prompt_for_search (pchar) int pchar; { int len; - char *pmt; + char *pmt, *p; rl_save_prompt (); - if (saved_local_prompt == 0) + /* We've saved the prompt, and can do anything with the various prompt + strings we need before they're restored. We want the unexpanded + portion of the prompt string after any final newline. */ + p = rl_prompt ? strrchr (rl_prompt, '\n') : 0; + if (p == 0) { len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0; pmt = (char *)xmalloc (len + 2); @@ -1998,19 +2002,17 @@ _rl_make_prompt_for_search (pchar) } else { - len = *saved_local_prompt ? strlen (saved_local_prompt) : 0; + p++; + len = strlen (p); pmt = (char *)xmalloc (len + 2); if (len) - strcpy (pmt, saved_local_prompt); + strcpy (pmt, p); pmt[len] = pchar; pmt[len+1] = '\0'; - local_prompt = savestring (pmt); - prompt_last_invisible = saved_last_invisible; - prompt_visible_length = saved_visible_length + 1; - } + } + /* will be overwritten by expand_prompt, called from rl_message */ prompt_physical_chars = saved_physical_chars + 1; - return pmt; } diff --git a/contrib/libreadline/readline.c b/contrib/libreadline/readline.c index 5e9767a..5eaaf47 100644 --- a/contrib/libreadline/readline.c +++ b/contrib/libreadline/readline.c @@ -282,6 +282,7 @@ rl_set_prompt (prompt) { FREE (rl_prompt); rl_prompt = prompt ? savestring (prompt) : (char *)NULL; + rl_display_prompt = rl_prompt ? rl_prompt : ""; rl_visible_prompt_length = rl_expand_prompt (rl_prompt); return 0; @@ -714,7 +715,7 @@ _rl_dispatch_subseq (key, map, got_subseq) rl_dispatching = 1; RL_SETSTATE(RL_STATE_DISPATCHING); - r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); + (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); RL_UNSETSTATE(RL_STATE_DISPATCHING); rl_dispatching = 0; diff --git a/contrib/libreadline/terminal.c b/contrib/libreadline/terminal.c index cc61388..eb72c19 100644 --- a/contrib/libreadline/terminal.c +++ b/contrib/libreadline/terminal.c @@ -122,7 +122,7 @@ char *_rl_term_up; static char *_rl_visible_bell; /* Non-zero means the terminal can auto-wrap lines. */ -int _rl_term_autowrap; +int _rl_term_autowrap = -1; /* Non-zero means that this terminal has a meta key. */ static int term_has_meta; @@ -274,6 +274,9 @@ void _rl_set_screen_size (rows, cols) int rows, cols; { + if (_rl_term_autowrap == -1) + _rl_init_terminal_io (rl_terminal_name); + if (rows > 0) _rl_screenheight = rows; if (cols > 0) diff --git a/contrib/libreadline/text.c b/contrib/libreadline/text.c index 9053e96..bb87604 100644 --- a/contrib/libreadline/text.c +++ b/contrib/libreadline/text.c @@ -1071,8 +1071,6 @@ int rl_delete (count, key) int count, key; { - int r; - if (count < 0) return (_rl_rubout_char (-count, key)); @@ -1090,17 +1088,17 @@ rl_delete (count, key) else rl_forward_byte (count, key); - r = rl_kill_text (orig_point, rl_point); + rl_kill_text (orig_point, rl_point); rl_point = orig_point; - return r; } else { int new_point; new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO); - return (rl_delete_text (rl_point, new_point)); + rl_delete_text (rl_point, new_point); } + return 0; } /* Delete the character under the cursor, unless the insertion |