- Timestamp:
- Dec 31, 2009, 7:35:24 PM (15 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 24bab8b
- Parents:
- cdd36982
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/readline-6.0-branch_update-2.patch
rcdd36982 r25e84be 1 Submitted By: J im Gifford (jim at cross-lfs dot org)2 Date: 06-05-20093 Initial Package Version: 6.0 1 Submitted By: Jonathan Norman (jonathan at bluesquarelinux.co.uk) 2 Date: 2009-12-31 3 Initial Package Version: 6.0 4 4 Origin: Upstream 5 5 Upstream Status: Applied 6 Description: Contains all upstream patches up to 6.0-00 36 Description: Contains all upstream patches up to 6.0-004 7 7 8 8 diff -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 -080010 +++ readline-6.0/display.c 2009- 06-05 14:07:00.000000000 -07009 --- 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 11 11 @@ -512,6 +512,7 @@ 12 12 /* Block keyboard interrupts because this function manipulates global … … 17 17 if (!rl_display_prompt) 18 18 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 @@ 20 43 visible_wrap_offset = wrap_offset; 21 44 } … … 25 48 } 26 49 27 @@ -1772,7 +17 74,7 @@50 @@ -1772,7 +1783,7 @@ 28 51 space_to_eol will insert too many spaces. XXX - maybe we should 29 52 adjust col_lendiff based on the difference between _rl_last_c_pos … … 34 57 { 35 58 if (_rl_term_autowrap && current_line < inv_botlin) 36 @@ -1892,6 +1 894,10 @@59 @@ -1892,6 +1903,10 @@ 37 60 38 61 woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset); … … 45 68 /* If we have multibyte characters, NEW is indexed by the buffer point in 46 69 a multibyte string, but _rl_last_c_pos is the display position. In 47 @@ -1905,9 +19 11,9 @@70 @@ -1905,9 +1920,9 @@ 48 71 prompt string, since they're both buffer indices and DPOS is a 49 72 desired display position. */ … … 58 81 { 59 82 diff -Naur readline-6.0.orig/patchlevel readline-6.0/patchlevel 60 --- readline-6.0.orig/patchlevel 200 8-11-18 08:01:14.000000000 -080061 +++ readline-6.0/patchlevel 2009- 06-05 14:07:00.000000000 -070083 --- 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 62 85 @@ -1,3 +1,3 @@ 63 86 # Do not edit -- exists only for use by patch … … 66 89 +3 67 90 diff -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 -080069 +++ readline-6.0/readline.h 2009- 06-05 14:06:57.000000000 -070091 --- 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 70 93 @@ -814,8 +814,9 @@ 71 94 #define RL_STATE_VIMOTION 0x100000 /* reading vi motion arg */ … … 80 103 #define RL_UNSETSTATE(x) (rl_readline_state &= ~(x)) 81 104 diff -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 -080083 +++ readline-6.0/terminal.c 2009- 06-05 14:06:57.000000000 -0700105 --- 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 84 107 @@ -355,7 +355,7 @@ 85 108 _rl_get_screen_size (fileno (rl_instream), 1);
Note:
See TracChangeset
for help on using the changeset viewer.