[83e4c6d] | 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-005 |
---|
| 7 | |
---|
| 8 | diff -Naur readline-6.3.orig/display.c readline-6.3/display.c |
---|
| 9 | --- readline-6.3.orig/display.c 2013-12-27 12:10:56.000000000 -0600 |
---|
| 10 | +++ readline-6.3/display.c 2014-04-24 20:09:52.659098542 -0500 |
---|
| 11 | @@ -2677,7 +2677,8 @@ |
---|
| 12 | { |
---|
| 13 | if (_rl_echoing_p) |
---|
| 14 | { |
---|
| 15 | - _rl_move_vert (_rl_vis_botlin); |
---|
| 16 | + if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */ |
---|
| 17 | + _rl_move_vert (_rl_vis_botlin); |
---|
| 18 | _rl_vis_botlin = 0; |
---|
| 19 | fflush (rl_outstream); |
---|
| 20 | rl_restart_output (1, 0); |
---|
| 21 | diff -Naur readline-6.3.orig/readline.c readline-6.3/readline.c |
---|
| 22 | --- readline-6.3.orig/readline.c 2013-10-28 13:58:06.000000000 -0500 |
---|
| 23 | +++ readline-6.3/readline.c 2014-04-24 20:09:49.666544077 -0500 |
---|
| 24 | @@ -744,7 +744,8 @@ |
---|
| 25 | r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ)); |
---|
| 26 | |
---|
| 27 | RL_CHECK_SIGNALS (); |
---|
| 28 | - if (r == 0) /* success! */ |
---|
| 29 | + /* We only treat values < 0 specially to simulate recursion. */ |
---|
| 30 | + if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */ |
---|
| 31 | { |
---|
| 32 | _rl_keyseq_chain_dispose (); |
---|
| 33 | RL_UNSETSTATE (RL_STATE_MULTIKEY); |
---|
| 34 | @@ -964,7 +965,7 @@ |
---|
| 35 | #if defined (VI_MODE) |
---|
| 36 | if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap && |
---|
| 37 | key != ANYOTHERKEY && |
---|
| 38 | - rl_key_sequence_length == 1 && /* XXX */ |
---|
| 39 | + _rl_dispatching_keymap == vi_movement_keymap && |
---|
| 40 | _rl_vi_textmod_command (key)) |
---|
| 41 | _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign); |
---|
| 42 | #endif |
---|
| 43 | diff -Naur readline-6.3.orig/rltypedefs.h readline-6.3/rltypedefs.h |
---|
| 44 | --- readline-6.3.orig/rltypedefs.h 2011-03-26 13:53:31.000000000 -0500 |
---|
| 45 | +++ readline-6.3/rltypedefs.h 2014-04-24 20:09:54.218697974 -0500 |
---|
| 46 | @@ -26,6 +26,25 @@ |
---|
| 47 | extern "C" { |
---|
| 48 | #endif |
---|
| 49 | |
---|
| 50 | +/* Old-style, attempt to mark as deprecated in some way people will notice. */ |
---|
| 51 | + |
---|
| 52 | +#if !defined (_FUNCTION_DEF) |
---|
| 53 | +# define _FUNCTION_DEF |
---|
| 54 | + |
---|
| 55 | +#if defined(__GNUC__) || defined(__clang__) |
---|
| 56 | +typedef int Function () __attribute__ ((deprecated)); |
---|
| 57 | +typedef void VFunction () __attribute__ ((deprecated)); |
---|
| 58 | +typedef char *CPFunction () __attribute__ ((deprecated)); |
---|
| 59 | +typedef char **CPPFunction () __attribute__ ((deprecated)); |
---|
| 60 | +#else |
---|
| 61 | +typedef int Function (); |
---|
| 62 | +typedef void VFunction (); |
---|
| 63 | +typedef char *CPFunction (); |
---|
| 64 | +typedef char **CPPFunction (); |
---|
| 65 | +#endif |
---|
| 66 | + |
---|
| 67 | +#endif /* _FUNCTION_DEF */ |
---|
| 68 | + |
---|
| 69 | /* New style. */ |
---|
| 70 | |
---|
| 71 | #if !defined (_RL_FUNCTION_TYPEDEF) |
---|
| 72 | diff -Naur readline-6.3.orig/util.c readline-6.3/util.c |
---|
| 73 | --- readline-6.3.orig/util.c 2013-09-02 12:36:12.000000000 -0500 |
---|
| 74 | +++ readline-6.3/util.c 2014-04-24 20:09:51.129496698 -0500 |
---|
| 75 | @@ -476,6 +476,7 @@ |
---|
| 76 | return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s))); |
---|
| 77 | } |
---|
| 78 | |
---|
| 79 | +#if defined (DEBUG) |
---|
| 80 | #if defined (USE_VARARGS) |
---|
| 81 | static FILE *_rl_tracefp; |
---|
| 82 | |
---|
| 83 | @@ -538,6 +539,7 @@ |
---|
| 84 | _rl_tracefp = fp; |
---|
| 85 | } |
---|
| 86 | #endif |
---|
| 87 | +#endif /* DEBUG */ |
---|
| 88 | |
---|
| 89 | |
---|
| 90 | #if HAVE_DECL_AUDIT_USER_TTY && defined (ENABLE_TTY_AUDIT_SUPPORT) |
---|