* lisp/cus-start.el (debug-on-quit): Fix custom type.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 13bbd3cf60028f9f5dd6a68dbd2618bcecac5efd..c6bb97b68c1e0c6c336358a5609d7e73ffe76040 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-07  Glenn Morris  <rgm@gnu.org>
+
+       * cus-start.el (debug-on-quit): Fix custom type.
+
 2011-10-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * subr.el (define-key-after): Clarify that the function is not
@@ -7,7 +11,7 @@
 
 2011-10-06  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
-       * lisp/eshell/eshell.el (eshell-command): Enable `eshell-mode' only
+       * eshell/eshell.el (eshell-command): Enable `eshell-mode' only
        in current minibuffer (Fix bug with recursive minibuffers).
 
 2011-10-06  Chong Yidong  <cyd@stupidchicken.com>

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 232c6c3808eb68e5f8facc454bbfd479117f7478..3760a7a9d743c7a1cb4e134ba02eb6b2fd7c01a6 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -180,12 +180,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
                                             (symbol :format "%v"))
                                     (const :tag "always" t)))
             (debug-ignored-errors debug (repeat (choice symbol regexp)))
-            (debug-on-quit debug
-                           (choice (const :tag "off")
-                                   (repeat :menu-tag "When"
-                                           :value (nil)
-                                           (symbol :format "%v"))
-                                   (const :tag "always" t)))
+            (debug-on-quit debug boolean)
              ;; fileio.c
              (delete-by-moving-to-trash auto-save boolean "23.1")
             (auto-save-visited-file-name auto-save boolean)