[f6afc87] | 1 | Submitted By: William Harrington (kb0iic at cross-lfs dot org) |
---|
| 2 | Date: 03-30-2014 |
---|
| 3 | Initial Package Version: 6.3 |
---|
| 4 | Origin: Upstream |
---|
| 5 | Upstream Status: Applied |
---|
| 6 | Description: Contains all upstream patches up to 6.3-003 |
---|
| 7 | |
---|
| 8 | diff -Naur readline-6.3.orig/patchlevel readline-6.3/patchlevel |
---|
| 9 | --- readline-6.3.orig/patchlevel 2013-11-15 07:11:11.000000000 -0600 |
---|
| 10 | +++ readline-6.3/patchlevel 2014-03-30 08:39:43.456378551 -0500 |
---|
| 11 | @@ -1,3 +1,3 @@ |
---|
| 12 | # Do not edit -- exists only for use by patch |
---|
| 13 | |
---|
| 14 | -5 |
---|
| 15 | +3 |
---|
| 16 | diff -Naur readline-6.3.orig/readline.c readline-6.3/readline.c |
---|
| 17 | --- readline-6.3.orig/readline.c 2013-10-28 13:58:06.000000000 -0500 |
---|
| 18 | +++ readline-6.3/readline.c 2014-03-30 08:39:41.509650434 -0500 |
---|
| 19 | @@ -744,7 +744,8 @@ |
---|
| 20 | r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ)); |
---|
| 21 | |
---|
| 22 | RL_CHECK_SIGNALS (); |
---|
| 23 | - if (r == 0) /* success! */ |
---|
| 24 | + /* We only treat values < 0 specially to simulate recursion. */ |
---|
| 25 | + if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ |
---|
| 26 | { |
---|
| 27 | _rl_keyseq_chain_dispose (); |
---|
| 28 | RL_UNSETSTATE (RL_STATE_MULTIKEY); |
---|
| 29 | @@ -964,7 +965,7 @@ |
---|
| 30 | #if defined (VI_MODE) |
---|
| 31 | if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && |
---|
| 32 | key != ANYOTHERKEY && |
---|
| 33 | - rl_key_sequence_length == 1 && /* XXX */ |
---|
| 34 | + _rl_dispatching_keymap == vi_movement_keymap && |
---|
| 35 | _rl_vi_textmod_command (key)) |
---|
| 36 | _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); |
---|
| 37 | #endif |
---|
| 38 | diff -Naur readline-6.3.orig/util.c readline-6.3/util.c |
---|
| 39 | --- readline-6.3.orig/util.c 2013-09-02 12:36:12.000000000 -0500 |
---|
| 40 | +++ readline-6.3/util.c 2014-03-30 08:39:43.456378551 -0500 |
---|
| 41 | @@ -476,6 +476,7 @@ |
---|
| 42 | return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s))); |
---|
| 43 | } |
---|
| 44 | |
---|
| 45 | +#if defined (DEBUG) |
---|
| 46 | #if defined (USE_VARARGS) |
---|
| 47 | static FILE *_rl_tracefp; |
---|
| 48 | |
---|
| 49 | @@ -538,6 +539,7 @@ |
---|
| 50 | _rl_tracefp = fp; |
---|
| 51 | } |
---|
| 52 | #endif |
---|
| 53 | +#endif /* DEBUG */ |
---|
| 54 | |
---|
| 55 | |
---|
| 56 | #if HAVE_DECL_AUDIT_USER_TTY && defined (ENABLE_TTY_AUDIT_SUPPORT) |
---|