Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (4cd7750a83711c3ceb47a469d70545bd4db25ca7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (4cd7750a83711c3ceb47a469d70545bd4db25ca7)
  • Date: Tue, 1 May 2007 09:36:26 -0500

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

libs/readline/DETAILS | 2 -
libs/readline/HISTORY | 8 ++++
libs/readline/PRE_BUILD | 3 +
libs/readline/readline52-003 | 37 ++++++++++++++++++++++
libs/readline/readline52-004 | 70
+++++++++++++++++++++++++++++++++++++++++++
5 files changed, 118 insertions(+), 2 deletions(-)

New commits:
commit 4cd7750a83711c3ceb47a469d70545bd4db25ca7
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

readline: Added latest two upstream patches. PATCHLEVEL++

diff --git a/libs/readline/DETAILS b/libs/readline/DETAILS
index bb427e5..c3b6360 100755
--- a/libs/readline/DETAILS
+++ b/libs/readline/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
LICENSE[0]=GPL
WEB_SITE=http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
ENTERED=20010922
- PATCHLEVEL=2
+ PATCHLEVEL=3
KEYWORDS="libs"
SHORT="readline lets users edit command lines as they are typed
in."
cat << EOF
diff --git a/libs/readline/HISTORY b/libs/readline/HISTORY
index da4298d..b6c6b64 100644
--- a/libs/readline/HISTORY
+++ b/libs/readline/HISTORY
@@ -1,6 +1,12 @@
+2007-05-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: Added patch readline52-003/004
+ * readline52-003: Added upstream patch
+ * readline52-004: Added upstream patch
+
2007-03-22 George Sherwood <george AT beernabeer.com>
* DETAILS: PATCHLEVEL++
- * PRE_BUILD: Added patch realine52-002
+ * PRE_BUILD: Added patch readline52-002
* readline52-002: Added upstream patch

2006-12-31 George Sherwood <george AT beernabeer.com>
diff --git a/libs/readline/PRE_BUILD b/libs/readline/PRE_BUILD
index ef3bcf7..fcdc774 100755
--- a/libs/readline/PRE_BUILD
+++ b/libs/readline/PRE_BUILD
@@ -3,6 +3,9 @@ cd $SOURCE_DIRECTORY &&

patch -p0 < $SCRIPT_DIRECTORY/readline52-001 &&
patch -p0 < $SCRIPT_DIRECTORY/readline52-002 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-003 &&
+patch -p0 < $SCRIPT_DIRECTORY/readline52-004
+

# Dynamically link against termcap or ncurses
sedit "s/SHLIB_LIBS =/SHLIB_LIBS = @TERMCAP_LIB@/" shlib/Makefile.in
diff --git a/libs/readline/readline52-003 b/libs/readline/readline52-003
new file mode 100644
index 0000000..06916b3
--- /dev/null
+++ b/libs/readline/readline52-003
@@ -0,0 +1,37 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-003
+
+Bug-Reported-by: Peter Volkov <torre_cremata AT mail.ru>
+Bug-Reference-ID: <1171795523.8021.18.camel@localhost>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-02/msg00054.html
+
+Bug-Description:
+
+When moving the cursor, bash sometimes misplaces the cursor when the prompt
+contains two or more multibyte characters. The particular circumstance that
+uncovered the problem was having the (multibyte) current directory name in
+the prompt string.
+
+Patch:
+
+*** ../readline-5.2.2/display.c Fri Jan 19 13:34:50 2007
+--- display.c Sat Mar 10 17:25:44 2007
+***************
+*** 1745,1749 ****
+ {
+ dpos = _rl_col_width (data, 0, new);
+! if (dpos > prompt_last_invisible) /* XXX - don't use
woff here */
+ {
+ dpos -= woff;
+--- 1745,1752 ----
+ {
+ dpos = _rl_col_width (data, 0, new);
+! /* Use NEW when comparing against the last invisible character in the
+! prompt string, since they're both buffer indices and DPOS is a
+! desired display position. */
+! if (new > prompt_last_invisible) /* XXX - don't use
woff here */
+ {
+ dpos -= woff;
diff --git a/libs/readline/readline52-004 b/libs/readline/readline52-004
new file mode 100644
index 0000000..b165ad9
--- /dev/null
+++ b/libs/readline/readline52-004
@@ -0,0 +1,70 @@
+ READLINE PATCH REPORT
+ =====================
+
+Readline-Release: 5.2
+Patch-ID: readline52-004
+
+Bug-Reported-by: Peter Volkov <torre_cremata AT mail.ru>
+Bug-Reference-ID: <1173636022.7039.36.camel@localhost>
+Bug-Reference-URL:
http://lists.gnu.org/archive/html/bug-bash/2007-03/msg00039.html
+
+Bug-Description:
+
+When restoring the original prompt after finishing an incremental search,
+bash sometimes places the cursor incorrectly if the primary prompt contains
+invisible characters.
+
+Patch:
+
+*** ../readline-5.2.3/display.c Fri Apr 20 13:30:16 2007
+--- display.c Fri Apr 20 15:17:01 2007
+***************
+*** 1599,1604 ****
+ if (temp > 0)
+ {
+ _rl_output_some_chars (nfd, temp);
+! _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
+ }
+ }
+--- 1599,1618 ----
+ if (temp > 0)
+ {
++ /* If nfd begins at the prompt, or before the invisible
++ characters in the prompt, we need to adjust _rl_last_c_pos
++ in a multibyte locale to account for the wrap offset and
++ set cpos_adjusted accordingly. */
+ _rl_output_some_chars (nfd, temp);
+! if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+! {
+! _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
+! if (current_line == 0 && wrap_offset && ((nfd - new) <=
prompt_last_invisible))
+! {
+! _rl_last_c_pos -= wrap_offset;
+! cpos_adjusted = 1;
+! }
+! }
+! else
+! _rl_last_c_pos += temp;
+ }
+ }
+***************
+*** 1608,1613 ****
+--- 1622,1639 ----
+ if (temp > 0)
+ {
++ /* If nfd begins at the prompt, or before the invisible
++ characters in the prompt, we need to adjust _rl_last_c_pos
++ in a multibyte locale to account for the wrap offset and
++ set cpos_adjusted accordingly. */
+ _rl_output_some_chars (nfd, temp);
+ _rl_last_c_pos += col_temp; /* XXX */
++ if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
++ {
++ if (current_line == 0 && wrap_offset && ((nfd - new) <=
prompt_last_invisible))
++ {
++ _rl_last_c_pos -= wrap_offset;
++ cpos_adjusted = 1;
++ }
++ }
+ }
+ lendiff = (oe - old) - (ne - new);



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (4cd7750a83711c3ceb47a469d70545bd4db25ca7), George Sherwood, 05/01/2007

Archive powered by MHonArc 2.6.24.

Top of Page