Small eshell-history-size fix.

* lisp/eshell/em-hist.el (eshell-hist-initialize):
Handle eshell-history-size nil and HISTSIZE set or unset.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ded8cc066fac5e1d83506ac0655beee4b79badf0..4f728dff33de8b299b27587c4ab17a65ea362b65 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-01  Glenn Morris  <rgm@gnu.org>
+
+       * eshell/em-hist.el (eshell-hist-initialize):
+       Handle eshell-history-size nil and HISTSIZE set or unset.
+
 2011-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * man.el (Man-completion-table): Fix the lambda case (bug#10168).

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index db5e98062a9b1504fdc904e49e66eb92921050be..975f1b171438415e2f16a10300cb92f6c8dda086 100644 (file)
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -261,7 +261,12 @@ element, regardless of any text on the command line.  In that case,
 
   (make-local-variable 'eshell-history-size)
   (or eshell-history-size
-      (setq eshell-history-size (getenv "HISTSIZE")))
+      (let ((hsize (getenv "HISTSIZE")))
+        (setq eshell-history-size
+             (if (and (> (length hsize) 0)
+                      (integerp (setq hsize (string-to-number hsize))))
+                 hsize
+               128))))
 
   (make-local-variable 'eshell-history-file-name)
   (or eshell-history-file-name