Index: BOOK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml (revision e74f725fe31a2ed43dcfd360eac77023e30aafa0)
+++ BOOK/introduction/common/changelog.xml (revision 06fcd8eba18cd3118f935995f052ce8522c574ad)
@@ -36,4 +36,13 @@
-->
+
+
+ August 02, 2010
+
+
+ [jciccone] - Updated Readline to 6.1.
+
+
+
Index: BOOK/packages.ent
===================================================================
--- BOOK/packages.ent (revision e74f725fe31a2ed43dcfd360eac77023e30aafa0)
+++ BOOK/packages.ent (revision 06fcd8eba18cd3118f935995f052ce8522c574ad)
@@ -358,8 +358,8 @@
-
-
+
+
-
+
Index: BOOK/patches.ent
===================================================================
--- BOOK/patches.ent (revision e74f725fe31a2ed43dcfd360eac77023e30aafa0)
+++ BOOK/patches.ent (revision 06fcd8eba18cd3118f935995f052ce8522c574ad)
@@ -69,7 +69,7 @@
-
-
-
+
+
+
Index: tches/readline-6.0-branch_update-2.patch
===================================================================
--- patches/readline-6.0-branch_update-2.patch (revision e74f725fe31a2ed43dcfd360eac77023e30aafa0)
+++ (revision )
@@ -1,115 +1,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-004
-
-diff -Naur readline-6.0.orig/display.c readline-6.0/display.c
---- 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. */
- _rl_block_sigint ();
-+ RL_SETSTATE (RL_STATE_REDISPLAYING);
-
- if (!rl_display_prompt)
- rl_display_prompt = "";
-@@ -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;
- }
-
-+ RL_UNSETSTATE (RL_STATE_REDISPLAYING);
- _rl_release_sigint ();
- }
-
-@@ -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 */
-- if (col_lendiff && (_rl_last_c_pos < _rl_screenwidth))
-+ if (col_lendiff && ((MB_CUR_MAX == 1 || rl_byte_oriented) || (_rl_last_c_pos < _rl_screenwidth)))
- #endif
- {
- if (_rl_term_autowrap && current_line < inv_botlin)
-@@ -1892,6 +1903,10 @@
-
- woff = WRAP_OFFSET (_rl_last_v_pos, wrap_offset);
- cpos = _rl_last_c_pos;
-+
-+ if (cpos == 0 && cpos == new)
-+ return;
-+
- #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 +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 */
-- (prompt_physical_chars > _rl_screenwidth &&
-+ (prompt_physical_chars >= _rl_screenwidth &&
- _rl_last_v_pos == prompt_last_screen_line &&
-- wrap_offset >= woff &&
-+ wrap_offset >= woff && dpos >= woff &&
- new > (prompt_last_invisible-(_rl_screenwidth*_rl_last_v_pos)-wrap_offset)))
- /* XXX last comparison might need to be >= */
- {
-diff -Naur readline-6.0.orig/patchlevel readline-6.0/patchlevel
---- 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-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 */
- #define RL_STATE_VICMDONCE 0x400000 /* entered vi command mode at least once */
-+#define RL_STATE_REDISPLAYING 0x800000 /* updating terminal display */
-
--#define RL_STATE_DONE 0x800000 /* done; accepted line */
-+#define RL_STATE_DONE 0x1000000 /* done; accepted line */
-
- #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-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 ())
- rl_forced_update_display ();
-- else
-+ else if (RL_ISSTATE(RL_STATE_REDISPLAYING) == 0)
- _rl_redisplay_after_sigwinch ();
- }
- }
Index: patches/readline-6.1-branch_update-1.patch
===================================================================
--- patches/readline-6.1-branch_update-1.patch (revision 06fcd8eba18cd3118f935995f052ce8522c574ad)
+++ patches/readline-6.1-branch_update-1.patch (revision 06fcd8eba18cd3118f935995f052ce8522c574ad)
@@ -0,0 +1,51 @@
+Submitted By: Joe Ciccone
+Date: 2010-08-03
+Initial Package Version: 6.1
+Origin: Upstream
+Upstream Status: From Upstream
+Description: Contains all upstream patches up to 6.1-002
+
+diff -Naur readline-6.1.orig/complete.c readline-6.1/complete.c
+--- readline-6.1.orig/complete.c 2009-11-29 23:39:30.000000000 +0000
++++ readline-6.1/complete.c 2010-08-04 01:25:55.061576555 +0000
+@@ -2138,7 +2138,7 @@
+ All other entries except "." and ".." match. */
+ if (filename_len == 0)
+ {
+- if (_rl_match_hidden_files == 0 && HIDDEN_FILE (entry->d_name))
++ if (_rl_match_hidden_files == 0 && HIDDEN_FILE (convfn))
+ continue;
+
+ if (convfn[0] != '.' ||
+@@ -2219,7 +2219,7 @@
+ temp[dirlen++] = '/';
+ }
+
+- strcpy (temp + dirlen, entry->d_name);
++ strcpy (temp + dirlen, convfn);
+ }
+ else
+ temp = savestring (convfn);
+diff -Naur readline-6.1.orig/patchlevel readline-6.1/patchlevel
+--- readline-6.1.orig/patchlevel 2008-11-18 16:01:14.000000000 +0000
++++ readline-6.1/patchlevel 2010-08-04 01:25:55.949701897 +0000
+@@ -1,3 +1,3 @@
+ # Do not edit -- exists only for use by patch
+
+-0
++2
+diff -Naur readline-6.1.orig/readline.h readline-6.1/readline.h
+--- readline-6.1.orig/readline.h 2009-08-27 03:05:55.000000000 +0000
++++ readline-6.1/readline.h 2010-08-04 01:25:55.949701897 +0000
+@@ -39,9 +39,9 @@
+ #endif
+
+ /* Hex-encoded Readline version number. */
+-#define RL_READLINE_VERSION 0x0600 /* Readline 6.0 */
++#define RL_READLINE_VERSION 0x0601 /* Readline 6.1 */
+ #define RL_VERSION_MAJOR 6
+-#define RL_VERSION_MINOR 0
++#define RL_VERSION_MINOR 1
+
+ /* Readline data structures. */
+