wok-current annotate readline/stuff/readline-6.3-upstream_fixes-3.patch @ rev 19134

vlc: add locale (thanks sonycrokett2000)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue May 17 16:06:04 2016 +0200 (2016-05-17)
parents
children
rev   line source
devl547@17610 1 Submitted By: Bruce Dubbs <bdubbs_at_linuxfromscratch_dot_org>
devl547@17610 2 Updated By: Armin K. <krejzi at email dot com>
devl547@17610 3 Date: 2014-10-04
devl547@17610 4 Initial Package Version: 6.3
devl547@17610 5 Upstream Status: Already in upstream patch repo
devl547@17610 6 Origin: Upstream
devl547@17610 7 Description: This patch contains upstream patch numbers 001 through 008.
devl547@17610 8
devl547@17610 9 --- a/display.c 2013-12-27 19:10:56.000000000 +0100
devl547@17610 10 +++ b/display.c 2014-10-04 21:30:27.039621661 +0200
devl547@17610 11 @@ -1637,7 +1637,7 @@
devl547@17610 12 /* If we are changing the number of invisible characters in a line, and
devl547@17610 13 the spot of first difference is before the end of the invisible chars,
devl547@17610 14 lendiff needs to be adjusted. */
devl547@17610 15 - if (current_line == 0 && !_rl_horizontal_scroll_mode &&
devl547@17610 16 + if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
devl547@17610 17 current_invis_chars != visible_wrap_offset)
devl547@17610 18 {
devl547@17610 19 if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
devl547@17610 20 @@ -1825,8 +1825,13 @@
devl547@17610 21 else
devl547@17610 22 _rl_last_c_pos += bytes_to_insert;
devl547@17610 23
devl547@17610 24 + /* XXX - we only want to do this if we are at the end of the line
devl547@17610 25 + so we move there with _rl_move_cursor_relative */
devl547@17610 26 if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
devl547@17610 27 - goto clear_rest_of_line;
devl547@17610 28 + {
devl547@17610 29 + _rl_move_cursor_relative (ne-new, new);
devl547@17610 30 + goto clear_rest_of_line;
devl547@17610 31 + }
devl547@17610 32 }
devl547@17610 33 }
devl547@17610 34 /* Otherwise, print over the existing material. */
devl547@17610 35 @@ -2677,7 +2682,8 @@
devl547@17610 36 {
devl547@17610 37 if (_rl_echoing_p)
devl547@17610 38 {
devl547@17610 39 - _rl_move_vert (_rl_vis_botlin);
devl547@17610 40 + if (_rl_vis_botlin > 0) /* minor optimization plus bug fix */
devl547@17610 41 + _rl_move_vert (_rl_vis_botlin);
devl547@17610 42 _rl_vis_botlin = 0;
devl547@17610 43 fflush (rl_outstream);
devl547@17610 44 rl_restart_output (1, 0);
devl547@17610 45 --- a/input.c 2014-01-10 21:07:08.000000000 +0100
devl547@17610 46 +++ b/input.c 2014-10-04 21:30:27.347630462 +0200
devl547@17610 47 @@ -534,8 +534,16 @@
devl547@17610 48 return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
devl547@17610 49 else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
devl547@17610 50 return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
devl547@17610 51 + /* keyboard-generated signals of interest */
devl547@17610 52 else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
devl547@17610 53 RL_CHECK_SIGNALS ();
devl547@17610 54 + /* non-keyboard-generated signals of interest */
devl547@17610 55 + else if (_rl_caught_signal == SIGALRM
devl547@17610 56 +#if defined (SIGVTALRM)
devl547@17610 57 + || _rl_caught_signal == SIGVTALRM
devl547@17610 58 +#endif
devl547@17610 59 + )
devl547@17610 60 + RL_CHECK_SIGNALS ();
devl547@17610 61
devl547@17610 62 if (rl_signal_event_hook)
devl547@17610 63 (*rl_signal_event_hook) ();
devl547@17610 64 --- a/misc.c 2012-09-02 00:03:11.000000000 +0200
devl547@17610 65 +++ b/misc.c 2014-10-04 21:30:27.625638402 +0200
devl547@17610 66 @@ -461,6 +461,7 @@
devl547@17610 67 saved_undo_list = 0;
devl547@17610 68 /* Set up rl_line_buffer and other variables from history entry */
devl547@17610 69 rl_replace_from_history (entry, 0); /* entry->line is now current */
devl547@17610 70 + entry->data = 0; /* entry->data is now current undo list */
devl547@17610 71 /* Undo all changes to this history entry */
devl547@17610 72 while (rl_undo_list)
devl547@17610 73 rl_do_undo ();
devl547@17610 74 @@ -468,7 +469,6 @@
devl547@17610 75 the timestamp. */
devl547@17610 76 FREE (entry->line);
devl547@17610 77 entry->line = savestring (rl_line_buffer);
devl547@17610 78 - entry->data = 0;
devl547@17610 79 }
devl547@17610 80 entry = previous_history ();
devl547@17610 81 }
devl547@17610 82 --- a/patchlevel 2013-11-15 14:11:11.000000000 +0100
devl547@17610 83 +++ b/patchlevel 2014-10-04 21:30:27.625638402 +0200
devl547@17610 84 @@ -1,3 +1,3 @@
devl547@17610 85 # Do not edit -- exists only for use by patch
devl547@17610 86
devl547@17610 87 -5
devl547@17610 88 +8
devl547@17610 89 --- a/readline.c 2013-10-28 19:58:06.000000000 +0100
devl547@17610 90 +++ b/readline.c 2014-10-04 21:30:25.951590557 +0200
devl547@17610 91 @@ -744,7 +744,8 @@
devl547@17610 92 r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
devl547@17610 93
devl547@17610 94 RL_CHECK_SIGNALS ();
devl547@17610 95 - if (r == 0) /* success! */
devl547@17610 96 + /* We only treat values < 0 specially to simulate recursion. */
devl547@17610 97 + if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0)) /* success! or failure! */
devl547@17610 98 {
devl547@17610 99 _rl_keyseq_chain_dispose ();
devl547@17610 100 RL_UNSETSTATE (RL_STATE_MULTIKEY);
devl547@17610 101 @@ -964,7 +965,7 @@
devl547@17610 102 #if defined (VI_MODE)
devl547@17610 103 if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
devl547@17610 104 key != ANYOTHERKEY &&
devl547@17610 105 - rl_key_sequence_length == 1 && /* XXX */
devl547@17610 106 + _rl_dispatching_keymap == vi_movement_keymap &&
devl547@17610 107 _rl_vi_textmod_command (key))
devl547@17610 108 _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
devl547@17610 109 #endif
devl547@17610 110 --- a/rltypedefs.h 2011-03-26 19:53:31.000000000 +0100
devl547@17610 111 +++ b/rltypedefs.h 2014-10-04 21:30:26.747613312 +0200
devl547@17610 112 @@ -26,6 +26,25 @@
devl547@17610 113 extern "C" {
devl547@17610 114 #endif
devl547@17610 115
devl547@17610 116 +/* Old-style, attempt to mark as deprecated in some way people will notice. */
devl547@17610 117 +
devl547@17610 118 +#if !defined (_FUNCTION_DEF)
devl547@17610 119 +# define _FUNCTION_DEF
devl547@17610 120 +
devl547@17610 121 +#if defined(__GNUC__) || defined(__clang__)
devl547@17610 122 +typedef int Function () __attribute__ ((deprecated));
devl547@17610 123 +typedef void VFunction () __attribute__ ((deprecated));
devl547@17610 124 +typedef char *CPFunction () __attribute__ ((deprecated));
devl547@17610 125 +typedef char **CPPFunction () __attribute__ ((deprecated));
devl547@17610 126 +#else
devl547@17610 127 +typedef int Function ();
devl547@17610 128 +typedef void VFunction ();
devl547@17610 129 +typedef char *CPFunction ();
devl547@17610 130 +typedef char **CPPFunction ();
devl547@17610 131 +#endif
devl547@17610 132 +
devl547@17610 133 +#endif /* _FUNCTION_DEF */
devl547@17610 134 +
devl547@17610 135 /* New style. */
devl547@17610 136
devl547@17610 137 #if !defined (_RL_FUNCTION_TYPEDEF)
devl547@17610 138 --- a/util.c 2013-09-02 19:36:12.000000000 +0200
devl547@17610 139 +++ b/util.c 2014-10-04 21:30:26.206597848 +0200
devl547@17610 140 @@ -476,6 +476,7 @@
devl547@17610 141 return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s)));
devl547@17610 142 }
devl547@17610 143
devl547@17610 144 +#if defined (DEBUG)
devl547@17610 145 #if defined (USE_VARARGS)
devl547@17610 146 static FILE *_rl_tracefp;
devl547@17610 147
devl547@17610 148 @@ -538,6 +539,7 @@
devl547@17610 149 _rl_tracefp = fp;
devl547@17610 150 }
devl547@17610 151 #endif
devl547@17610 152 +#endif /* DEBUG */
devl547@17610 153
devl547@17610 154
devl547@17610 155 #if HAVE_DECL_AUDIT_USER_TTY && defined (ENABLE_TTY_AUDIT_SUPPORT)