Changeset b6604d9

Timestamp:

May 17, 2014, 8:34:22 PM (11 years ago)

Author:

Chris Staub <chris@…>

Parents:

8a51bde

git-author:

William Harrington <kb0iic@…> (05/17/14 12:07:12)

git-committer:

Chris Staub <chris@…> (05/17/14 20:34:22)

Message:

Replace readline 6.3 level 5 patch with level 6 patch.

File:

• patches/readline-6.3-branch_update-3.patch (moved) (moved from patches/readline-6.3-branch_update-2.patch ) (4 diffs)

patches/readline-6.3-branch_update-3.patch

@@ -1 +1 @@
 Submitted By: William Harrington (kb0iic at cross-lfs dot org)
-Date: 03-30-2014
+Date: 05-17-2014
 Initial Package Version: 6.3
 Origin: Upstream
 Upstream Status: Applied
-Description: Contains all upstream patches up to 6.3-005
+Description: Contains all upstream patches up to 6.3-006
 
 diff -Naur readline-6.3.orig/display.c readline-6.3/display.c
---- readline-6.3.orig/display.c 2013-12-27 12:10:56.000000000 -0600
-+++ readline-6.3/display.c      2014-04-24 20:09:52.659098542 -0500
-@@ -2677,7 +2677,8 @@
+--- readline-6.3.orig/display.c 2013-12-27 18:10:56.000000000 +0000
++++ readline-6.3/display.c      2014-05-17 23:40:59.102644473 +0000
+@@ -1637,7 +1637,7 @@
+   /* If we are changing the number of invisible characters in a line, and
+      the spot of first difference is before the end of the invisible chars,
+      lendiff needs to be adjusted. */
+-  if (current_line == 0 && !_rl_horizontal_scroll_mode &&
++  if (current_line == 0 && /* !_rl_horizontal_scroll_mode && */
+       current_invis_chars != visible_wrap_offset)
+     {
+       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+@@ -1825,8 +1825,13 @@
+              else
+                _rl_last_c_pos += bytes_to_insert;
+ 
++             /* XXX - we only want to do this if we are at the end of the line
++                so we move there with _rl_move_cursor_relative */
+              if (_rl_horizontal_scroll_mode && ((oe-old) > (ne-new)))
+-               goto clear_rest_of_line;
++               {
++                 _rl_move_cursor_relative (ne-new, new);
++                 goto clear_rest_of_line;
++               }
+            }
+        }
+       /* Otherwise, print over the existing material. */
+@@ -2677,7 +2682,8 @@
  {
    if (_rl_echoing_p)
@@ -19 +43 @@
        fflush (rl_outstream);
        rl_restart_output (1, 0);
+diff -Naur readline-6.3.orig/patchlevel readline-6.3/patchlevel
+--- readline-6.3.orig/patchlevel        2013-11-15 13:11:11.000000000 +0000
++++ readline-6.3/patchlevel     2014-05-17 23:40:59.102644473 +0000
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+ 
+-5
++6
 diff -Naur readline-6.3.orig/readline.c readline-6.3/readline.c
---- readline-6.3.orig/readline.c        2013-10-28 13:58:06.000000000 -0500
-+++ readline-6.3/readline.c     2014-04-24 20:09:49.666544077 -0500
+--- readline-6.3.orig/readline.c        2013-10-28 18:58:06.000000000 +0000
++++ readline-6.3/readline.c     2014-05-17 23:40:59.092644501 +0000
 @@ -744,7 +744,8 @@
      r = _rl_subseq_result (r, cxt->oldmap, cxt->okey, (cxt->flags & KSEQ_SUBSEQ));
@@ -42 +74 @@
  #endif
 diff -Naur readline-6.3.orig/rltypedefs.h readline-6.3/rltypedefs.h
---- readline-6.3.orig/rltypedefs.h      2011-03-26 13:53:31.000000000 -0500
-+++ readline-6.3/rltypedefs.h   2014-04-24 20:09:54.218697974 -0500
+--- readline-6.3.orig/rltypedefs.h      2011-03-26 18:53:31.000000000 +0000
++++ readline-6.3/rltypedefs.h   2014-05-17 23:40:59.099311149 +0000
 @@ -26,6 +26,25 @@
  extern "C" {
@@ -71 +103 @@
  #if !defined (_RL_FUNCTION_TYPEDEF)
 diff -Naur readline-6.3.orig/util.c readline-6.3/util.c
---- readline-6.3.orig/util.c    2013-09-02 12:36:12.000000000 -0500
-+++ readline-6.3/util.c 2014-04-24 20:09:51.129496698 -0500
+--- readline-6.3.orig/util.c    2013-09-02 17:36:12.000000000 +0000
++++ readline-6.3/util.c 2014-05-17 23:40:59.095977825 +0000
 @@ -476,6 +476,7 @@
    return (strcpy ((char *)xmalloc (1 + (int)strlen (s)), (s)));