source: patches/readline-6.3-branch_update-3.patch @ be1c363

clfs-3.0.0-systemdsystemd
Last change on this file since be1c363 was 8b8c815, checked in by William Harrington <kb0iic@…>, 9 years ago

Replace readline 6.3 level 5 patch with level 6 patch.

  • Property mode set to 100644
File size: 4.1 KB
RevLine 
[83e4c6d]1Submitted By: William Harrington (kb0iic at cross-lfs dot org)
[8b8c815]2Date: 05-17-2014
[83e4c6d]3Initial Package Version: 6.3
4Origin: Upstream
5Upstream Status: Applied
[8b8c815]6Description: Contains all upstream patches up to 6.3-006
[83e4c6d]7
8diff -Naur readline-6.3.orig/display.c readline-6.3/display.c
[8b8c815]9--- readline-6.3.orig/display.c 2013-12-27 18:10:56.000000000 +0000
10+++ readline-6.3/display.c      2014-05-17 23:40:59.102644473 +0000
11@@ -1637,7 +1637,7 @@
12   /* If we are changing the number of invisible characters in a line, and
13      the spot of first difference is before the end of the invisible chars,
14      lendiff needs to be adjusted. */
15-  if (current_line == 0 && !_rl_horizontal_scroll_mode &&
16+  if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
17       current_invis_chars != visible_wrap_offset)
18     {
19       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
20@@ -1825,8 +1825,13 @@
21              else
22                _rl_last_c_pos += bytes_to_insert;
23 
24+             /* XXX - we only want to do this if we are at the end of the line
25+                so we move there with _rl_move_cursor_relative */
26              if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
27-               goto clear_rest_of_line;
28+               {
29+                 _rl_move_cursor_relative (ne-new, new);
30+                 goto clear_rest_of_line;
31+               }
32            }
33        }
34       /* Otherwise, print over the existing material. */
35@@ -2677,7 +2682,8 @@
[83e4c6d]36 {
37   if (_rl_echoing_p)
38     {
39-      _rl_move_vert (_rl_vis_botlin);
40+      if (_rl_vis_botlin > 0)  /* minor optimization plus bug fix */
41+       _rl_move_vert (_rl_vis_botlin);
42       _rl_vis_botlin = 0;
43       fflush (rl_outstream);
44       rl_restart_output (1, 0);
[8b8c815]45diff -Naur readline-6.3.orig/patchlevel readline-6.3/patchlevel
46--- readline-6.3.orig/patchlevel        2013-11-15 13:11:11.000000000 +0000
47+++ readline-6.3/patchlevel     2014-05-17 23:40:59.102644473 +0000
48@@ -1,3 +1,3 @@
49 # Do not edit -- exists only for use by patch
50 
51-5
52+6
[83e4c6d]53diff -Naur readline-6.3.orig/readline.c readline-6.3/readline.c
[8b8c815]54--- readline-6.3.orig/readline.c        2013-10-28 18:58:06.000000000 +0000
55+++ readline-6.3/readline.c     2014-05-17 23:40:59.092644501 +0000
[83e4c6d]56@@ -744,7 +744,8 @@
57     r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
58 
59   RL_CHECK_SIGNALS ();
60-  if (r == 0)                  /* success! */
61+  /* We only treat values < 0 specially to simulate recursion. */
62+  if (r >= 0 || (r == -1 && (cxt->flags & KSEQ_SUBSEQ) == 0))  /* success! or failure! */
63     {
64       _rl_keyseq_chain_dispose ();
65       RL_UNSETSTATE (RL_STATE_MULTIKEY);
66@@ -964,7 +965,7 @@
67 #if defined (VI_MODE)
68   if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
69       key != ANYOTHERKEY &&
70-      rl_key_sequence_length == 1 &&   /* XXX */
71+      _rl_dispatching_keymap == vi_movement_keymap &&
72       _rl_vi_textmod_command (key))
73     _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
74 #endif
75diff -Naur readline-6.3.orig/rltypedefs.h readline-6.3/rltypedefs.h
[8b8c815]76--- readline-6.3.orig/rltypedefs.h      2011-03-26 18:53:31.000000000 +0000
77+++ readline-6.3/rltypedefs.h   2014-05-17 23:40:59.099311149 +0000
[83e4c6d]78@@ -26,6 +26,25 @@
79 extern "C" {
80 #endif
81 
82+/* Old-style, attempt to mark as deprecated in some way people will notice. */
83+
84+#if !defined (_FUNCTION_DEF)
85+#  define _FUNCTION_DEF
86+
87+#if defined(__GNUC__) || defined(__clang__)
88+typedef int Function () __attribute__ ((deprecated));
89+typedef void VFunction () __attribute__ ((deprecated));
90+typedef char *CPFunction () __attribute__ ((deprecated));
91+typedef char **CPPFunction () __attribute__ ((deprecated));
92+#else
93+typedef int Function ();
94+typedef void VFunction ();
95+typedef char *CPFunction ();
96+typedef char **CPPFunction ();
97+#endif
98+
99+#endif /* _FUNCTION_DEF */
100+
101 /* New style. */
102 
103 #if !defined (_RL_FUNCTION_TYPEDEF)
104diff -Naur readline-6.3.orig/util.c readline-6.3/util.c
[8b8c815]105--- readline-6.3.orig/util.c    2013-09-02 17:36:12.000000000 +0000
106+++ readline-6.3/util.c 2014-05-17 23:40:59.095977825 +0000
[83e4c6d]107@@ -476,6 +476,7 @@
108   return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s)));
109 }
110 
111+#if defined (DEBUG)
112 #if defined (USE_VARARGS)
113 static FILE *_rl_tracefp;
114 
115@@ -538,6 +539,7 @@
116   _rl_tracefp = fp;
117 }
118 #endif
119+#endif /* DEBUG */
120 
121 
122 #if HAVE_DECL_AUDIT_USER_TTY && defined (ENABLE_TTY_AUDIT_SUPPORT)
Note: See TracBrowser for help on using the repository browser.