* savehist.el (savehist-autosave-interval): Allow setting to nil

  through customize.  (Bug#5056)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66710ac75ec0203888c8b1f0e18a2891d83ff782..e8fd70568be482bf920466be1bc47a7496a4e6d8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-30  Ryan C. Thompson  <rct@thompsonclan.org>  (tiny change)
+
+       * savehist.el (savehist-autosave-interval): Allow setting to nil
+       through customize.  (Bug#5056)
+
 2009-11-30  Juanma Barranquero  <lekktu@gmail.com>
 
        Fix references to jit-lock properties.

diff --git a/lisp/savehist.el b/lisp/savehist.el
index 8dd308610acf70d3f98b9f3b94da9cf33172ec6a..20db8da23c9c51e71b8e050681f4b8cf90bac4bb 100644 (file)
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -120,7 +120,8 @@ the user's privacy."
 (defcustom savehist-autosave-interval (* 5 60)
   "The interval between autosaves of minibuffer history.
 If set to nil, disables timer-based autosaving."
-  :type 'integer
+  :type '(choice (const :tag "Disabled" nil)
+                 (integer :tag "Seconds"))
   :group 'savehist)
 
 (defcustom savehist-mode-hook nil