commit bc4cd23ce958feda898c618215f94d8a4e8f4ffa
author Jari Aalto <jari.aalto@cante.net> Thu Jul 23 14:37:54 1998 +0000
committer Jari Aalto <jari.aalto@cante.net> Sat Sep 12 16:46:52 2009 +0000
tree 32fc9a13b636cb4d29873feddc533d3dfb25a917
parent cce855bc5b117cb7ae70064131120687bc69fac0

Imported from ../bash-2.02.1.tar.gz.

bashline.c

diff --git a/bashline.c b/bashline.c
index a86e662..3709050 100644
--- a/bashline.c
+++ b/bashline.c
@@ -213,7 +213,9 @@
 
 #ifdef ALIAS
   rl_add_defun ("alias-expand-line", (Function *)alias_expand_line, -1);
+#  ifdef BANG_HISTORY
   rl_add_defun ("history-and-alias-expand-line", (Function *)history_and_alias_expand_line, -1);
+#  endif
 #endif
 
   /* Backwards compatibility. */
@@ -538,7 +540,7 @@
         continue;
 
       /* OK, it matches.  Add it to the list. */
-      if (nmatch >= rsize)
+      if (nmatch >= (rsize - 1))
 	{
 	  rsize = (rsize + 16) - (rsize % 16);
 	  result = (char **)xrealloc (result, rsize * sizeof (char *));