[Emacs-diffs] /srv/bzr/emacs/trunk r106571: Small eshell-history-size fix.

[Glenn Morris]

------------------------------------------------------------
revno: 106571
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-12-01 17:28:10 -0500
message:
  Small eshell-history-size fix.
  
  * lisp/eshell/em-hist.el (eshell-hist-initialize):
  Handle eshell-history-size nil and HISTSIZE set or unset.
modified:
  lisp/ChangeLog
  lisp/eshell/em-hist.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-12-01 19:38:24 +0000
+++ b/lisp/ChangeLog    2011-12-01 22:28:10 +0000
@@ -1,3 +1,8 @@
+2011-12-01  Glenn Morris  <address@hidden>
+
+       * eshell/em-hist.el (eshell-hist-initialize):
+       Handle eshell-history-size nil and HISTSIZE set or unset.
+
 2011-12-01  Stefan Monnier  <address@hidden>
 
        * man.el (Man-completion-table): Fix the lambda case (bug#10168).

=== modified file 'lisp/eshell/em-hist.el'
--- a/lisp/eshell/em-hist.el    2011-11-14 20:23:26 +0000
+++ b/lisp/eshell/em-hist.el    2011-12-01 22:28:10 +0000
@@ -261,7 +261,12 @@
 
   (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