From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 30 Nov 2009 23:39:04 +0000 (+0000)
Subject: * savehist.el (savehist-autosave-interval): Allow setting to nil
X-Git-Tag: emacs-pretest-23.1.90~155
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ac7e73ec4f72a59d87adc0c431010c03e8b51ea;p=emacs.git

* savehist.el (savehist-autosave-interval): Allow setting to nil
  through customize.  (Bug#5056)
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66710ac75ec..e8fd70568be 100644
--- 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 8dd308610ac..20db8da23c9 100644
--- 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