Skip to Content.
Sympa Menu

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

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 (326df667ab4a47da09ec94c951ce7b4738f2503a)
  • Date: Tue, 1 May 2007 09:47:58 -0500

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

shell-term-fm/bash/DETAILS | 2
shell-term-fm/bash/HISTORY | 5 ++
shell-term-fm/bash/PRE_BUILD | 5 +-
shell-term-fm/bash/patches/bash32-016 | 52 ++++++++++++++++++++
shell-term-fm/bash/patches/bash32-017 | 85
++++++++++++++++++++++++++++++++++
5 files changed, 147 insertions(+), 2 deletions(-)

New commits:
commit 326df667ab4a47da09ec94c951ce7b4738f2503a
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

bash: Added lastest two upstream patches. PATCHLEVEL++

diff --git a/shell-term-fm/bash/DETAILS b/shell-term-fm/bash/DETAILS
index c527cfd..9da27bc 100755
--- a/shell-term-fm/bash/DETAILS
+++ b/shell-term-fm/bash/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE2_GPG="gurus.gpg:${SOURCE2}.sig"
WEB_SITE=http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html
ENTERED=20010922
- PATCHLEVEL=11
+ PATCHLEVEL=12
LICENSE[0]=GPL2
KEYWORDS="console"
SHORT="Bourne Again SHell for the GNU operating system"
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index 41e96ef..25a9847 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,8 @@
+2007-05-01 George Sherwood <george AT beernabeer.com>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: added bash32-016/017
+ * bash32-016-bash32-017: Added new upstream patches.
+
2007-03-24 George Sherwood <george AT beernabeer.com>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Added bash32-011-bash32-015
diff --git a/shell-term-fm/bash/PRE_BUILD b/shell-term-fm/bash/PRE_BUILD
index 7be0fb1..a69fa21 100755
--- a/shell-term-fm/bash/PRE_BUILD
+++ b/shell-term-fm/bash/PRE_BUILD
@@ -15,4 +15,7 @@ patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-011 &&
patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-012 &&
patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-013 &&
patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-014 &&
-patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-015
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-015 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-016 &&
+patch -p0 < $SCRIPT_DIRECTORY/patches/bash32-017
+
diff --git a/shell-term-fm/bash/patches/bash32-016
b/shell-term-fm/bash/patches/bash32-016
new file mode 100644
index 0000000..a0f065a
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-016
@@ -0,0 +1,52 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-016
+
+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:
+
+*** ../bash-3.2/lib/readline/display.c Fri Jan 19 13:34:50 2007
+--- lib/readline/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;
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 15
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 16
+
+ #endif /* _PATCHLEVEL_H_ */
diff --git a/shell-term-fm/bash/patches/bash32-017
b/shell-term-fm/bash/patches/bash32-017
new file mode 100644
index 0000000..99e5e70
--- /dev/null
+++ b/shell-term-fm/bash/patches/bash32-017
@@ -0,0 +1,85 @@
+ BASH PATCH REPORT
+ =================
+
+Bash-Release: 3.2
+Patch-ID: bash32-017
+
+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:
+
+*** ../bash-3.2.16/lib/readline/display.c Fri Apr 20 13:30:16 2007
+--- lib/readline/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);
+*** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
+--- patchlevel.h Mon Oct 16 14:22:54 2006
+***************
+*** 26,30 ****
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 16
+
+ #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+ looks for to find the patch level (for the sccs version string). */
+
+! #define PATCHLEVEL 17
+
+ #endif /* _PATCHLEVEL_H_ */



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

Archive powered by MHonArc 2.6.24.

Top of Page