diff options
| author | Juergen Daubert <jue@jue.li> | 2009-08-15 10:25:17 +0200 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2009-08-15 10:26:41 +0200 |
| commit | 3d126cd8af4e003cc82ad2fd859fd8b1d2a0bccf (patch) | |
| tree | 230fd444c6dc7c13a9939e9cec49710c07bf0c6e /readline | |
| parent | 0a37d4d44ea239bd30f7e67768341e8d2df9c57a (diff) | |
| download | core-3d126cd8af4e003cc82ad2fd859fd8b1d2a0bccf.tar.gz core-3d126cd8af4e003cc82ad2fd859fd8b1d2a0bccf.tar.xz | |
readline: forgot to add new patch
Diffstat (limited to 'readline')
| -rw-r--r-- | readline/readline-6.0-001-004.patch (renamed from readline/readline-6.0-001-003.patch) | 63 |
1 files changed, 63 insertions, 0 deletions
diff --git a/readline/readline-6.0-001-003.patch b/readline/readline-6.0-001-004.patch index 384dd4ba..d9e555fd 100644 --- a/readline/readline-6.0-001-003.patch +++ b/readline/readline-6.0-001-004.patch @@ -179,3 +179,66 @@ Patch: # Do not edit -- exists only for use by patch ! 3 + READLINE PATCH REPORT + ===================== + +Readline-Release: 6.0 +Patch-ID: readline60-004 + +Bug-Reported-by: jim@jim.sh +Bug-Reference-ID: <200905262140.n4QLeO4X030664@psychosis.jim.sh> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-05/msg00074.html + +Bug-Description: + +There are occasional cursor positioning errors when using readline's +horizontal scroll mode. + +Patch: + +*** ../readline-6.0-patched/display.c 2009-05-22 12:32:25.000000000 -0400 +--- display.c 2009-05-29 23:32:20.000000000 -0400 +*************** +*** 1190,1196 **** + line[t - 1] = '>'; + +! if (!rl_display_fixed || forced_display || lmargin != last_lmargin) + { + forced_display = 0; + update_line (&visible_line[last_lmargin], + &invisible_line[lmargin], +--- 1192,1200 ---- + line[t - 1] = '>'; + +! if (rl_display_fixed == 0 || forced_display || lmargin != last_lmargin) + { + forced_display = 0; ++ o_cpos = _rl_last_c_pos; ++ cpos_adjusted = 0; + update_line (&visible_line[last_lmargin], + &invisible_line[lmargin], +*************** +*** 1200,1203 **** +--- 1204,1214 ---- + 0); + ++ if ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) && ++ cpos_adjusted == 0 && ++ _rl_last_c_pos != o_cpos && ++ _rl_last_c_pos > wrap_offset && ++ o_cpos < prompt_last_invisible) ++ _rl_last_c_pos -= prompt_invis_chars_first_line; /* XXX - was wrap_offset */ ++ + /* If the visible new line is shorter than the old, but the number + of invisible characters is greater, and we are at the end of +*** ../readline-6.0/patchlevel 2008-11-18 11:01:14.000000000 -0500 +--- patchlevel 2009-05-09 12:01:06.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 3 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 4 |