Fix some em-hist custom types.

* lisp/eshell/em-hist.el (eshell-history-file-name, eshell-history-size):
Fix custom type.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4f728dff33de8b299b27587c4ab17a65ea362b65..4659d11878955b7435ba22e8d41fa3de426df105 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
        * eshell/em-hist.el (eshell-hist-initialize):
        Handle eshell-history-size nil and HISTSIZE set or unset.
+       (eshell-history-file-name, eshell-history-size): Fix custom type.
 
 2011-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 5ae419f7ba93c295c7c4c70d6a0ec32efb1c919d..5e44e541526fd293c88e112ed016d1ec8bf6a0c6 100644 (file)
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -90,12 +90,14 @@
   "If non-nil, name of the file to read/write input history.
 See also `eshell-read-history' and `eshell-write-history'.
 If it is nil, Eshell will use the value of HISTFILE."
-  :type 'file
+  :type '(choice (const :tag "Use HISTFILE" nil)
+                file)
   :group 'eshell-hist)
 
 (defcustom eshell-history-size 128
   "Size of the input history ring.  If nil, use envvar HISTSIZE."
-  :type 'integer
+  :type '(choice (const :tag "Use HISTSIZE" nil)
+                integer)
   :group 'eshell-hist)
 
 (defcustom eshell-hist-ignoredups nil