Changeset 25e84be for patches


Ignore:
Timestamp:
Dec 31, 2009, 11:35:24 AM (13 years ago)
Author:
Jonathan Norman <nate@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
24bab8b
Parents:
cdd36982
Message:

updated readline patch to -2

File:
1 moved

Legend:

Unmodified
Added
Removed
  • patches/readline-6.0-branch_update-2.patch

    rcdd36982 r25e84be  
    1 Submitted By: Jim Gifford (jim at cross-lfs dot org)
    2 Date: 06-05-2009
    3 Initial Package Version: 6.0
     1Submitted By: Jonathan Norman (jonathan at bluesquarelinux.co.uk)
     2Date: 2009-12-31
     3Initial Package Version: 6.0 
    44Origin: Upstream
    55Upstream Status: Applied
    6 Description: Contains all upstream patches up to 6.0-003
     6Description: Contains all upstream patches up to 6.0-004
    77
    88diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
    9 --- readline-6.0.orig/display.c 2009-01-04 11:32:32.000000000 -0800
    10 +++ readline-6.0/display.c      2009-06-05 14:07:00.000000000 -0700
     9--- readline-6.0.orig/display.c 2009-12-31 18:52:45.000000000 +0000
     10+++ readline-6.0/display.c      2009-12-31 19:05:02.000000000 +0000
    1111@@ -512,6 +512,7 @@
    1212   /* Block keyboard interrupts because this function manipulates global
     
    1717   if (!rl_display_prompt)
    1818     rl_display_prompt = "";
    19 @@ -1236,6 +1237,7 @@
     19@@ -1191,6 +1192,8 @@
     20       if (!rl_display_fixed || forced_display || lmargin != last_lmargin)
     21        {
     22          forced_display = 0;
     23+         o_cpos = _rl_last_c_pos;
     24+         cpos_adjusted = 0;
     25          update_line (&visible_line[last_lmargin],
     26                       &invisible_line[lmargin],
     27                       0,
     28@@ -1198,6 +1201,13 @@
     29                       _rl_screenwidth + (lmargin ? 0 : wrap_offset),
     30                       0);
     31 
     32+         if ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
     33+             cpos_adjusted == 0 &&
     34+             _rl_last_c_pos != o_cpos &&
     35+             _rl_last_c_pos > wrap_offset &&
     36+             o_cpos < prompt_last_invisible)
     37+               _rl_last_c_pos -= prompt_invis_chars_first_line;        /* XXX - was wrap_offset */
     38+
     39          /* If the visible new line is shorter than the old, but the number
     40             of invisible characters is greater, and we are at the end of
     41             the new line, we need to clear to eol. */
     42@@ -1236,6 +1246,7 @@
    2043       visible_wrap_offset = wrap_offset;
    2144   }
     
    2548 }
    2649 
    27 @@ -1772,7 +1774,7 @@
     50@@ -1772,7 +1783,7 @@
    2851             space_to_eol will insert too many spaces.  XXX - maybe we should
    2952             adjust col_lendiff based on the difference between _rl_last_c_pos
     
    3457            {     
    3558              if (_rl_term_autowrap && current_line < inv_botlin)
    36 @@ -1892,6 +1894,10 @@
     59@@ -1892,6 +1903,10 @@
    3760 
    3861   woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
     
    4568   /* If we have multibyte characters, NEW is indexed by the buffer point in
    4669      a multibyte string, but _rl_last_c_pos is the display position.  In
    47 @@ -1905,9 +1911,9 @@
     70@@ -1905,9 +1920,9 @@
    4871         prompt string, since they're both buffer indices and DPOS is a
    4972         desired display position. */
     
    5881        {
    5982diff -Naur readline-6.0.orig/patchlevel readline-6.0/patchlevel
    60 --- readline-6.0.orig/patchlevel        2008-11-18 08:01:14.000000000 -0800
    61 +++ readline-6.0/patchlevel     2009-06-05 14:07:00.000000000 -0700
     83--- readline-6.0.orig/patchlevel        2009-12-31 18:52:45.000000000 +0000
     84+++ readline-6.0/patchlevel     2009-12-31 18:58:11.000000000 +0000
    6285@@ -1,3 +1,3 @@
    6386 # Do not edit -- exists only for use by patch
     
    6689+3
    6790diff -Naur readline-6.0.orig/readline.h readline-6.0/readline.h
    68 --- readline-6.0.orig/readline.h        2009-01-04 11:32:33.000000000 -0800
    69 +++ readline-6.0/readline.h     2009-06-05 14:06:57.000000000 -0700
     91--- readline-6.0.orig/readline.h        2009-12-31 18:52:45.000000000 +0000
     92+++ readline-6.0/readline.h     2009-12-31 18:58:11.000000000 +0000
    7093@@ -814,8 +814,9 @@
    7194 #define RL_STATE_VIMOTION      0x100000        /* reading vi motion arg */
     
    80103 #define RL_UNSETSTATE(x)       (rl_readline_state &= ~(x))
    81104diff -Naur readline-6.0.orig/terminal.c readline-6.0/terminal.c
    82 --- readline-6.0.orig/terminal.c        2009-01-04 11:32:34.000000000 -0800
    83 +++ readline-6.0/terminal.c     2009-06-05 14:06:57.000000000 -0700
     105--- readline-6.0.orig/terminal.c        2009-12-31 18:52:45.000000000 +0000
     106+++ readline-6.0/terminal.c     2009-12-31 18:58:11.000000000 +0000
    84107@@ -355,7 +355,7 @@
    85108       _rl_get_screen_size (fileno (rl_instream), 1);
Note: See TracChangeset for help on using the changeset viewer.