[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 25e84be295656ccb51cd9e546ed59edf7be54eaf
git
git at cross-lfs.org
Fri Jan 1 06:22:34 PST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via 25e84be295656ccb51cd9e546ed59edf7be54eaf (commit)
from cdd3698231365cfc7b7299b963661c631d4c4392 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 25e84be295656ccb51cd9e546ed59edf7be54eaf
Author: Jonathan Norman <nate at trigger.local>
Date: Thu Dec 31 19:35:24 2009 +0000
updated readline patch to -2
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 41ef416..882d09d 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -37,6 +37,15 @@
-->
<listitem>
+ <para>December 31, 2009</para>
+ <itemizedlist>
+ <listitem>
+ <para>[Jonathan] - Updated Readline Patch to -2.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>December 30, 2009</para>
<itemizedlist>
<listitem>
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 19ab5e3..91ff00b 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -92,9 +92,9 @@
<!ENTITY perl-libc-patch-md5 "7597ce482d09fe48ad0a95d26902823b">
<!ENTITY perl-libc-patch-size "1 KB">
-<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-1.patch">
-<!ENTITY readline-branch_update-patch-md5 "1113f58c09eebb9839c5fc4d692416d9">
-<!ENTITY readline-branch_update-patch-size "3 KB">
+<!ENTITY readline-branch_update-patch "readline-&readline-version;-branch_update-2.patch">
+<!ENTITY readline-branch_update-patch-md5 "1e92533f7b03e03bd0a73703d0d9cc75">
+<!ENTITY readline-branch_update-patch-size "8 KB">
<!ENTITY sysvinit-fixes-patch "sysvinit-&sysvinit-version;-fixes-1.patch">
<!ENTITY sysvinit-fixes-patch-md5 "405d23896b54ca61afd53003a62592fd">
diff --git a/patches/readline-6.0-branch_update-1.patch b/patches/readline-6.0-branch_update-2.patch
similarity index 63%
rename from patches/readline-6.0-branch_update-1.patch
rename to patches/readline-6.0-branch_update-2.patch
index 03b9302..046c897 100644
--- a/patches/readline-6.0-branch_update-1.patch
+++ b/patches/readline-6.0-branch_update-2.patch
@@ -1,13 +1,13 @@
-Submitted By: Jim Gifford (jim at cross-lfs dot org)
-Date: 06-05-2009
-Initial Package Version: 6.0
+Submitted By: Jonathan Norman (jonathan at bluesquarelinux.co.uk)
+Date: 2009-12-31
+Initial Package Version: 6.0
Origin: Upstream
Upstream Status: Applied
-Description: Contains all upstream patches up to 6.0-003
+Description: Contains all upstream patches up to 6.0-004
diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
---- readline-6.0.orig/display.c 2009-01-04 11:32:32.000000000 -0800
-+++ readline-6.0/display.c 2009-06-05 14:07:00.000000000 -0700
+--- readline-6.0.orig/display.c 2009-12-31 18:52:45.000000000 +0000
++++ readline-6.0/display.c 2009-12-31 19:05:02.000000000 +0000
@@ -512,6 +512,7 @@
/* Block keyboard interrupts because this function manipulates global
data structures. */
@@ -16,7 +16,30 @@ diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
if (!rl_display_prompt)
rl_display_prompt = "";
-@@ -1236,6 +1237,7 @@
+@@ -1191,6 +1192,8 @@
+ if (!rl_display_fixed || 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],
+ 0,
+@@ -1198,6 +1201,13 @@
+ _rl_screenwidth + (lmargin ? 0 : wrap_offset),
+ 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
+ the new line, we need to clear to eol. */
+@@ -1236,6 +1246,7 @@
visible_wrap_offset = wrap_offset;
}
@@ -24,7 +47,7 @@ diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
_rl_release_sigint ();
}
-@@ -1772,7 +1774,7 @@
+@@ -1772,7 +1783,7 @@
space_to_eol will insert too many spaces. XXX - maybe we should
adjust col_lendiff based on the difference between _rl_last_c_pos
and _rl_screenwidth */
@@ -33,7 +56,7 @@ diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
#endif
{
if (_rl_term_autowrap && current_line < inv_botlin)
-@@ -1892,6 +1894,10 @@
+@@ -1892,6 +1903,10 @@
woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
cpos = _rl_last_c_pos;
@@ -44,7 +67,7 @@ diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
#if defined (HANDLE_MULTIBYTE)
/* 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
-@@ -1905,9 +1911,9 @@
+@@ -1905,9 +1920,9 @@
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 */
@@ -57,16 +80,16 @@ diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
/* XXX last comparison might need to be >= */
{
diff -Naur readline-6.0.orig/patchlevel readline-6.0/patchlevel
---- readline-6.0.orig/patchlevel 2008-11-18 08:01:14.000000000 -0800
-+++ readline-6.0/patchlevel 2009-06-05 14:07:00.000000000 -0700
+--- readline-6.0.orig/patchlevel 2009-12-31 18:52:45.000000000 +0000
++++ readline-6.0/patchlevel 2009-12-31 18:58:11.000000000 +0000
@@ -1,3 +1,3 @@
# Do not edit -- exists only for use by patch
-0
+3
diff -Naur readline-6.0.orig/readline.h readline-6.0/readline.h
---- readline-6.0.orig/readline.h 2009-01-04 11:32:33.000000000 -0800
-+++ readline-6.0/readline.h 2009-06-05 14:06:57.000000000 -0700
+--- readline-6.0.orig/readline.h 2009-12-31 18:52:45.000000000 +0000
++++ readline-6.0/readline.h 2009-12-31 18:58:11.000000000 +0000
@@ -814,8 +814,9 @@
#define RL_STATE_VIMOTION 0x100000 /* reading vi motion arg */
#define RL_STATE_MULTIKEY 0x200000 /* reading multiple-key command */
@@ -79,8 +102,8 @@ diff -Naur readline-6.0.orig/readline.h readline-6.0/readline.h
#define RL_SETSTATE(x) (rl_readline_state |= (x))
#define RL_UNSETSTATE(x) (rl_readline_state &= ~(x))
diff -Naur readline-6.0.orig/terminal.c readline-6.0/terminal.c
---- readline-6.0.orig/terminal.c 2009-01-04 11:32:34.000000000 -0800
-+++ readline-6.0/terminal.c 2009-06-05 14:06:57.000000000 -0700
+--- readline-6.0.orig/terminal.c 2009-12-31 18:52:45.000000000 +0000
++++ readline-6.0/terminal.c 2009-12-31 18:58:11.000000000 +0000
@@ -355,7 +355,7 @@
_rl_get_screen_size (fileno (rl_instream), 1);
if (CUSTOM_REDISPLAY_FUNC ())
-----------------------------------------------------------------------
Summary of changes:
BOOK/introduction/common/changelog.xml | 9 +++
BOOK/patches.ent | 6 +-
...-1.patch => readline-6.0-branch_update-2.patch} | 55 ++++++++++++++------
3 files changed, 51 insertions(+), 19 deletions(-)
rename patches/{readline-6.0-branch_update-1.patch => readline-6.0-branch_update-2.patch} (63%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list