diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 2006-03-27 23:45:09 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 2006-03-27 23:45:09 +0000 |
commit | 3343da209a2714ccfb737b62df8a4b7abaa865d7 (patch) | |
tree | 88a6734a269859fa66c46ba5486cf7261bb6e51f | |
parent | 4a3b1618bf06cc240f7faa032782b73d1bdbd24f (diff) | |
parent | 1719ccc2c3a605887fde78feeb6d23911c269a47 (diff) | |
download | src-3343da209a2714ccfb737b62df8a4b7abaa865d7.tar.gz src-3343da209a2714ccfb737b62df8a4b7abaa865d7.zip |
This commit was generated by cvs2svn to compensate for changes in r157191,
which included commits to RCS files with non-trunk default branches.
Notes
Notes:
svn path=/head/; revision=157192
-rw-r--r-- | contrib/libreadline/readline.c | 3 | ||||
-rw-r--r-- | contrib/libreadline/text.c | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/contrib/libreadline/readline.c b/contrib/libreadline/readline.c index 5e9767ab47f9..5eaaf47435e6 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/text.c b/contrib/libreadline/text.c index 9053e96903bb..bb87604aa6d4 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 |