summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAron Griffis <agriffis@gentoo.org>2004-08-02 22:30:18 +0000
committerAron Griffis <agriffis@gentoo.org>2004-08-02 22:30:18 +0000
commit510f527a90edf7a317ac44ec851f3ffd70080d70 (patch)
treec2da266c2c70446e88b082e1dc55b1f800d4315b /app-shells/bash/files
parentelfutils does not actually seem to compile currently in a uClibc environment ... (diff)
downloadgentoo-2-510f527a90edf7a317ac44ec851f3ffd70080d70.tar.gz
gentoo-2-510f527a90edf7a317ac44ec851f3ffd70080d70.tar.bz2
gentoo-2-510f527a90edf7a317ac44ec851f3ffd70080d70.zip
Fix bash-3.0-invisible.patch to work for more than the simple test case I used last time ;-)
Diffstat (limited to 'app-shells/bash/files')
-rw-r--r--app-shells/bash/files/bash-3.0-invisible.patch29
1 files changed, 19 insertions, 10 deletions
diff --git a/app-shells/bash/files/bash-3.0-invisible.patch b/app-shells/bash/files/bash-3.0-invisible.patch
index d45cb91e5aa0..3c8a7a5a56e3 100644
--- a/app-shells/bash/files/bash-3.0-invisible.patch
+++ b/app-shells/bash/files/bash-3.0-invisible.patch
@@ -1,19 +1,20 @@
---- bash-3.0/lib/readline/display.c.agriffis 2004-08-02 09:34:14.000000000 -0400
-+++ bash-3.0/lib/readline/display.c 2004-08-02 10:48:26.256360524 -0400
-@@ -258,15 +258,16 @@
+--- bash-3.0/lib/readline/display.c 2004-05-27 22:57:51.000000000 -0400
++++ bash-3.0.agriffis/lib/readline/display.c 2004-08-02 17:43:02.000000000 -0400
+@@ -258,23 +258,21 @@
#endif
{
*r++ = *p;
- if (!ignoring)
-- rl++; /* visible length byte counter */
+ if (!ignoring)
-+ {
-+ rl++; /* visible length byte counter */
-+ if (rl >= _rl_screenwidth)
+ rl++; /* visible length byte counter */
+- else
+- ninvis++; /* invisible chars byte counter */
++ else
++ {
++ ninvis++; /* invisible chars byte counter */
++ if (rl < _rl_screenwidth)
+ invfl = ninvis;
-+ }
- else
- ninvis++; /* invisible chars byte counter */
++ }
}
- if (rl >= _rl_screenwidth)
@@ -22,3 +23,11 @@
if (ignoring == 0)
physchars++;
}
+ }
+
+- if (rl < _rl_screenwidth)
+- invfl = ninvis;
+-
+ *r = '\0';
+ if (lp)
+ *lp = rl;