[readline/f15/master] include patch 001

[Miroslav Lichvar]

commit a21f7b33a2868e0554f680eb6afdf8caf7b65fa6
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Tue Mar 1 13:12:37 2011 +0100

    include patch 001

 readline.spec  |    8 +++++++-
 readline62-001 |   46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletions(-)
---
diff --git a/readline.spec b/readline.spec
index cbc4c2c..6984d4e 100644
--- a/readline.spec
+++ b/readline.spec
@@ -1,11 +1,13 @@
 Summary: A library for editing typed command lines
 Name: readline
 Version: 6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv3+
 Group: System Environment/Libraries
 URL: http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
 Source: ftp://ftp.gnu.org/gnu/readline/readline-%{version}.tar.gz
+# upstream patches
+Patch1: ftp://ftp.cwru.edu/pub/bash/readline-6.2-patches/readline62-001
 # fix file permissions, remove RPATH, use CFLAGS
 Patch20: readline-6.2-shlib.patch
 # add TTY input audit support
@@ -48,6 +50,7 @@ library.
 
 %prep
 %setup -q
+%patch1 -p0
 %patch20 -p1 -b .shlib
 %patch21 -p1 -b .audit
 
@@ -127,6 +130,9 @@ fi
 %{_libdir}/lib*.a
 
 %changelog
+* Tue Mar 01 2011 Miroslav Lichvar <mlichvar at redhat.com> 6.2-2
+- include patch 001
+
 * Tue Feb 15 2011 Miroslav Lichvar <mlichvar at redhat.com> 6.2-1
 - update to 6.2
 
diff --git a/readline62-001 b/readline62-001
new file mode 100644
index 0000000..d4563c3
--- /dev/null
+++ b/readline62-001
@@ -0,0 +1,46 @@
+			   READLINE PATCH REPORT
+			   =====================
+
+Readline-Release: 6.2
+Patch-ID: readline62-001
+
+Bug-Reported-by:	Clark J. Wang <dearvoid at gmail.com>
+Bug-Reference-ID:	<AANLkTimGbW7aC4E5infXP6ku5WPci4t=xVc+L1SyHqrD at mail.gmail.com>
+Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00157.html
+
+Bug-Description:
+
+The readline vi-mode `cc', `dd', and `yy' commands failed to modify the
+entire line.
+
+[This patch intentionally does not modify patchlevel]
+
+Patch (apply with `patch -p0'):
+
+*** ../readline-6.2-patched/vi_mode.c	2010-11-20 19:51:39.000000000 -0500
+--- vi_mode.c	2011-02-17 20:24:25.000000000 -0500
+***************
+*** 1115,1119 ****
+        _rl_vi_last_motion = c;
+        RL_UNSETSTATE (RL_STATE_VIMOTION);
+!       return (0);
+      }
+  #if defined (READLINE_CALLBACKS)
+--- 1115,1119 ----
+        _rl_vi_last_motion = c;
+        RL_UNSETSTATE (RL_STATE_VIMOTION);
+!       return (vidomove_dispatch (m));
+      }
+  #if defined (READLINE_CALLBACKS)
+*** ../readline-6.2-patched/callback.c	2010-06-06 12:18:58.000000000 -0400
+--- callback.c	2011-02-17 20:43:28.000000000 -0500
+***************
+*** 149,152 ****
+--- 149,155 ----
+  	  /* Should handle everything, including cleanup, numeric arguments,
+  	     and turning off RL_STATE_VIMOTION */
++ 	  if (RL_ISSTATE (RL_STATE_NUMERICARG) == 0)
++ 	    _rl_internal_char_cleanup ();
++ 
+  	  return;
+  	}