[Emacs-diffs] /srv/bzr/emacs/trunk r106573: Fix some em-hist custom types.

[Glenn Morris]

------------------------------------------------------------
revno: 106573
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-12-01 17:34:24 -0500
message:
  Fix some em-hist custom types.
  
  * lisp/eshell/em-hist.el (eshell-history-file-name, eshell-history-size):
  Fix custom type.
modified:
  lisp/ChangeLog
  lisp/eshell/em-hist.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-12-01 22:28:10 +0000
+++ b/lisp/ChangeLog    2011-12-01 22:34:24 +0000
@@ -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  <address@hidden>
 

=== modified file 'lisp/eshell/em-hist.el'
--- a/lisp/eshell/em-hist.el    2011-12-01 22:30:12 +0000
+++ b/lisp/eshell/em-hist.el    2011-12-01 22:34:24 +0000
@@ -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