summaryrefslogtreecommitdiff
path: root/bash/bash-2.05b/bash205b-006.patch
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
committerChris Larson <clarson@kergoth.com>2004-11-09 00:36:47 +0000
commitf96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch)
treeedb17ec2c4ea13c5acb1c7350957a249a820e28d /bash/bash-2.05b/bash205b-006.patch
parentb6588aa6851fb220cedc387d21c51513ef8d67f4 (diff)
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'bash/bash-2.05b/bash205b-006.patch')
-rw-r--r--bash/bash-2.05b/bash205b-006.patch90
1 files changed, 90 insertions, 0 deletions
diff --git a/bash/bash-2.05b/bash205b-006.patch b/bash/bash-2.05b/bash205b-006.patch
index e69de29bb2..2642f5173f 100644
--- a/bash/bash-2.05b/bash205b-006.patch
+++ b/bash/bash-2.05b/bash205b-006.patch
@@ -0,0 +1,90 @@
+*** ../bash-2.05b/lib/readline/display.c Tue Jun 4 10:54:47 2002
+--- lib/readline/display.c Fri Sep 13 16:22:57 2002
+***************
+*** 71,75 ****
+
+ #if defined (HANDLE_MULTIBYTE)
+! static int _rl_col_width PARAMS((char *, int, int));
+ static int *_rl_wrapped_line;
+ #else
+--- 71,75 ----
+
+ #if defined (HANDLE_MULTIBYTE)
+! static int _rl_col_width PARAMS((const char *, int, int));
+ static int *_rl_wrapped_line;
+ #else
+***************
+*** 1349,1355 ****
+ _rl_output_some_chars (nfd + lendiff, temp - lendiff);
+ #if 0
+- _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff) - col_lendiff;
+- #else
+ _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
+ #endif
+ }
+--- 1349,1355 ----
+ _rl_output_some_chars (nfd + lendiff, temp - lendiff);
+ #if 0
+ _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
++ #else
++ _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
+ #endif
+ }
+***************
+*** 1511,1516 ****
+ /* If we have multibyte characters, NEW is indexed by the buffer point in
+ a multibyte string, but _rl_last_c_pos is the display position. In
+! this case, NEW's display position is not obvious. */
+! if ((MB_CUR_MAX == 1 || rl_byte_oriented ) && _rl_last_c_pos == new) return;
+ #else
+ if (_rl_last_c_pos == new) return;
+--- 1511,1523 ----
+ /* If we have multibyte characters, NEW is indexed by the buffer point in
+ a multibyte string, but _rl_last_c_pos is the display position. In
+! this case, NEW's display position is not obvious and must be
+! calculated. */
+! if (MB_CUR_MAX == 1 || rl_byte_oriented)
+! {
+! if (_rl_last_c_pos == new)
+! return;
+! }
+! else if (_rl_last_c_pos == _rl_col_width (data, 0, new))
+! return;
+ #else
+ if (_rl_last_c_pos == new) return;
+***************
+*** 1595,1603 ****
+ {
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+! {
+! tputs (_rl_term_cr, 1, _rl_output_character_function);
+! for (i = 0; i < new; i++)
+! putc (data[i], rl_outstream);
+! }
+ else
+ _rl_backspace (_rl_last_c_pos - new);
+--- 1602,1606 ----
+ {
+ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+! _rl_backspace (_rl_last_c_pos - _rl_col_width (data, 0, new));
+ else
+ _rl_backspace (_rl_last_c_pos - new);
+***************
+*** 2118,2122 ****
+ static int
+ _rl_col_width (str, start, end)
+! char *str;
+ int start, end;
+ {
+--- 2121,2125 ----
+ static int
+ _rl_col_width (str, start, end)
+! const char *str;
+ int start, end;
+ {
+***************
+*** 2194,2196 ****
+ }
+ #endif /* HANDLE_MULTIBYTE */
+-
+--- 2197,2198 ----