[Emacs-diffs] /srv/bzr/emacs/trunk r106012: * lisp/cus-start.el (debug-on-quit): Fix custom type.

[Glenn Morris]

------------------------------------------------------------
revno: 106012
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2011-10-06 22:17:29 -0400
message:
  * lisp/cus-start.el (debug-on-quit): Fix custom type.
modified:
  lisp/ChangeLog
  lisp/cus-start.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-10-06 19:15:19 +0000
+++ b/lisp/ChangeLog    2011-10-07 02:17:29 +0000
@@ -1,3 +1,7 @@
+2011-10-07  Glenn Morris  <address@hidden>
+
+       * cus-start.el (debug-on-quit): Fix custom type.
+
 2011-10-06  Lars Magne Ingebrigtsen  <address@hidden>
 
        * subr.el (define-key-after): Clarify that the function is not
@@ -7,7 +11,7 @@
 
 2011-10-06  Thierry Volpiatto  <address@hidden>
 
-       * 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  <address@hidden>

=== modified file 'lisp/cus-start.el'
--- a/lisp/cus-start.el 2011-08-23 15:53:46 +0000
+++ b/lisp/cus-start.el 2011-10-07 02:17:29 +0000
@@ -180,12 +180,7 @@
                                             (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)