commit bash-20040311 snapshot

bashhist.c

@@ -1,6 +1,6 @@
 /* bashhist.c -- bash interface to the GNU history library. */
 
-/* Copyright (C) 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2004 Free Software Foundation, Inc.
 
    This file is part of GNU Bash, the Bourne Again SHell.
 
@@ -52,6 +52,7 @@
 
 #if defined (READLINE)
 #  include "bashline.h"
+extern int rl_done, rl_dispatching;	/* should really include readline.h */
 #endif
 
 #if !defined (errno)
@@ -444,12 +445,19 @@ pre_process_line (line, print_changes, addit)
 	  /* If there was an error, return NULL. */
 	  if (expanded < 0 || expanded == 2)	/* 2 == print only */
 	    {
+#    if defined (READLINE)
+	      if (expanded == 2 && rl_dispatching == 0 && *history_value)
+#    else	      
+	      if (expanded == 2 && *history_value)
+#    endif /* !READLINE */
+		maybe_add_history (history_value);
+
 	      free (history_value);
 
 #    if defined (READLINE)
 	      /* New hack.  We can allow the user to edit the
 		 failed history expansion. */
-	      if (history_reediting && expanded < 0)
+	      if (history_reediting && expanded < 0 && rl_done)
 		re_edit (line);
 #    endif /* READLINE */
 	      return ((char *)NULL);