# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1259624344 0
# Node ID efe6269d9301e317dc57bb98db393735aeace349
# Parent  359e597e3e017b4949996b494350d10ae0d03447
* savehist.el (savehist-autosave-interval): Allow setting to nil
  through customize.  (Bug#5056)

diff -r 359e597e3e01 -r efe6269d9301 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Nov 30 22:51:34 2009 +0000
+++ b/lisp/ChangeLog	Mon Nov 30 23:39:04 2009 +0000
@@ -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 -r 359e597e3e01 -r efe6269d9301 lisp/savehist.el
--- a/lisp/savehist.el	Mon Nov 30 22:51:34 2009 +0000
+++ b/lisp/savehist.el	Mon Nov 30 23:39:04 2009 +0000
@@ -120,7 +120,8 @@
 (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