From f4b417c62a4f272c4cf9a074d0f7a3a97201f9db Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <yath@yath.de>
Date: Tue, 17 Apr 2012 11:23:35 +0200
Subject: Update to upstream bash 4.2

This upgrades bash to from 4.1-rc to 4.2-release. See CWRU/changelog for
changes.

Change-Id: I926269c300cf44fa25964b5b375a148fcf11c4b7
---
 lib/readline/kill.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/readline/kill.c')

diff --git a/lib/readline/kill.c b/lib/readline/kill.c
index a4d6d14..1a78783 100644
--- a/lib/readline/kill.c
+++ b/lib/readline/kill.c
@@ -147,7 +147,7 @@ _rl_copy_to_kill_ring (text, append)
 	  strcat (new, old);
 	}
       xfree (old);
-      free (text);
+      xfree (text);
       rl_kill_ring[slot] = new;
     }
   else
@@ -601,7 +601,7 @@ rl_yank_nth_arg_internal (count, ignore, history_skip)
 #endif /* VI_MODE */
 
   rl_insert_text (arg);
-  free (arg);
+  xfree (arg);
 
   rl_end_undo_group ();
   return 0;
@@ -640,7 +640,7 @@ rl_yank_last_arg (count, key)
     {
       if (undo_needed)
 	rl_do_undo ();
-      if (count < 1)
+      if (count < 0)		/* XXX - was < 1 */
         direction = -direction;
       history_skip += direction;
       if (history_skip < 0)
-- 
cgit v1.1