[46f79ff] | 1 | Submitted By: Jim Gifford (patches at jg555 dot com) |
---|
| 2 | Date: 2006-02-06 |
---|
| 3 | Initial Package Version: 5.1 |
---|
| 4 | Origin: Upstream |
---|
| 5 | Upstream Status: Applied |
---|
| 6 | Description: Contains Patch 001-002 from Upstream |
---|
| 7 | |
---|
| 8 | diff -Naur readline-5.1.orig/readline.c readline-5.1/readline.c |
---|
| 9 | --- readline-5.1.orig/readline.c 2005-07-05 02:29:35.000000000 +0000 |
---|
| 10 | +++ readline-5.1/readline.c 2006-02-06 22:23:31.000000000 +0000 |
---|
| 11 | @@ -714,7 +714,7 @@ |
---|
| 12 | |
---|
| 13 | rl_dispatching = 1; |
---|
| 14 | RL_SETSTATE(RL_STATE_DISPATCHING); |
---|
| 15 | - r = (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); |
---|
| 16 | + (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); |
---|
| 17 | RL_UNSETSTATE(RL_STATE_DISPATCHING); |
---|
| 18 | rl_dispatching = 0; |
---|
| 19 | |
---|
| 20 | diff -Naur readline-5.1.orig/terminal.c readline-5.1/terminal.c |
---|
| 21 | --- readline-5.1.orig/terminal.c 2005-11-13 01:46:54.000000000 +0000 |
---|
| 22 | +++ readline-5.1/terminal.c 2006-02-06 22:24:54.000000000 +0000 |
---|
| 23 | @@ -122,7 +122,7 @@ |
---|
| 24 | static char *_rl_visible_bell; |
---|
| 25 | |
---|
| 26 | /* Non-zero means the terminal can auto-wrap lines. */ |
---|
| 27 | -int _rl_term_autowrap; |
---|
| 28 | +int _rl_term_autowrap = -1; |
---|
| 29 | |
---|
| 30 | /* Non-zero means that this terminal has a meta key. */ |
---|
| 31 | static int term_has_meta; |
---|
| 32 | @@ -274,6 +274,9 @@ |
---|
| 33 | _rl_set_screen_size (rows, cols) |
---|
| 34 | int rows, cols; |
---|
| 35 | { |
---|
| 36 | + if (_rl_term_autowrap == -1) |
---|
| 37 | + _rl_init_terminal_io (rl_terminal_name); |
---|
| 38 | + |
---|
| 39 | if (rows > 0) |
---|
| 40 | _rl_screenheight = rows; |
---|
| 41 | if (cols > 0) |
---|
| 42 | diff -Naur readline-5.1.orig/text.c readline-5.1/text.c |
---|
| 43 | --- readline-5.1.orig/text.c 2005-09-24 23:06:07.000000000 +0000 |
---|
| 44 | +++ readline-5.1/text.c 2006-02-06 22:23:31.000000000 +0000 |
---|
| 45 | @@ -1071,8 +1071,6 @@ |
---|
| 46 | rl_delete (count, key) |
---|
| 47 | int count, key; |
---|
| 48 | { |
---|
| 49 | - int r; |
---|
| 50 | - |
---|
| 51 | if (count < 0) |
---|
| 52 | return (_rl_rubout_char (-count, key)); |
---|
| 53 | |
---|
| 54 | @@ -1090,17 +1088,17 @@ |
---|
| 55 | else |
---|
| 56 | rl_forward_byte (count, key); |
---|
| 57 | |
---|
| 58 | - r = rl_kill_text (orig_point, rl_point); |
---|
| 59 | + rl_kill_text (orig_point, rl_point); |
---|
| 60 | rl_point = orig_point; |
---|
| 61 | - return r; |
---|
| 62 | } |
---|
| 63 | else |
---|
| 64 | { |
---|
| 65 | int new_point; |
---|
| 66 | |
---|
| 67 | new_point = MB_NEXTCHAR (rl_line_buffer, rl_point, 1, MB_FIND_NONZERO); |
---|
| 68 | - return (rl_delete_text (rl_point, new_point)); |
---|
| 69 | + rl_delete_text (rl_point, new_point); |
---|
| 70 | } |
---|
| 71 | + return 0; |
---|
| 72 | } |
---|
| 73 | |
---|
| 74 | /* Delete the character under the cursor, unless the insertion |
---|