(mail-citation-header): New variable.

[gnu-emacs] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index c94e155052018b9b4fd2c9176d333018b0bc7b35..7289533a273d22147b850800bf66d5f5c4f8d2a1 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -45,6 +45,7 @@
             ;; buffer.c
             (mode-line-format modeline sexp) ;Hard to do right.
             (default-major-mode internal function)
+            (enable-multibyte-characters mule boolean)
             (case-fold-search matching boolean)
             (fill-column fill integer)
             (left-margin fill integer)
@@ -56,7 +57,7 @@
                                        (integer :tag "space"
                                                 :format "%v"
                                                 1)
-                                       (const :tag "on" t)))
+                                       (other :tag "on" t)))
             (selective-display-ellipses display boolean)
             (transient-mark-mode editing-basics boolean)
             ;; callint.c
@@ -92,7 +93,12 @@
                                             (symbol :format "%v"))
                                     (const :tag "always" t)))
             (debug-ignored-errors debug (repeat (choice symbol regexp)))
-            (debug-on-quit debug choice)
+            (debug-on-quit debug
+                           (choice (const :tag "off")
+                                   (repeat :menu-tag "When"
+                                           :value (nil)
+                                           (symbol :format "%v"))
+                                   (const :tag "always" t)))
             ;; fileio.c
             (insert-default-directory minibuffer boolean)
             ;; frame.c
@@ -107,21 +113,21 @@
             (auto-save-interval auto-save integer)
             (auto-save-timeout auto-save (choice (const :tag "off" nil)
                                                  (integer :format "%v")))
-            (echo-keystrokes minibuffer boolean)
+            (echo-keystrokes minibuffer integer)
             (polling-period keyboard integer)
-            (double-click-time mouse integer)
+            (double-click-time mouse (restricted-sexp
+                                      :match-alternatives (integerp 'nil 't)))
             (inhibit-local-menu-bar-menus menu boolean)
             (help-char keyboard character)
             (help-event-list keyboard (repeat (sexp :format "%v")))
             (menu-prompting menu boolean)
-            (track-mouse mouse boolean)
             (suggest-key-bindings keyboard (choice (const :tag "off" nil)
                                                    (integer :tag "time" 2)
-                                                   (sexp :tag "on"
-                                                         :format "%t")))
+                                                   (other :tag "on")))
             ;; lread.c
             (load-path environment 
                        (repeat (choice :tag "[Current dir?]"
+                                       :format "%[Current dir?%] %v"
                                        (const :tag " current dir" nil)
                                        (directory :format "%v"))))
             ;; minibuf.c
@@ -168,7 +174,7 @@
             (same-window-buffer-names windows (repeat (string :format "%v")))
             (same-window-regexps windows (repeat (regexp :format "%v")))
             (pop-up-windows windows boolean)
-            (next-screen-context-lines windows boolean)
+            (next-screen-context-lines windows integer)
             (split-height-threshold windows integer)
             (window-min-height windows integer)
             (window-min-width windows integer)
@@ -181,7 +187,7 @@
             (message-log-max debug (choice (const :tag "Disable" nil)
                                            (integer :menu-tag "lines"
                                                     :format "%v")
-                                           (const :tag "Unlimited" t)))
+                                           (other :tag "Unlimited" t)))
             ;; xfns.c
             (x-bitmap-file-path installation
                                 (repeat (directory :format "%v")))))
@@ -208,7 +214,7 @@
          type (nth 2 this))
     (if (not (boundp symbol))
        ;; If variables are removed from C code, give an error here!
-       (message "Built-in variable `%S' not bound" symbol)
+       (message "Note, built-in variable `%S' not bound" symbol)
       ;; Save the standard value, unless we already did.
       (or (get symbol 'standard-value)
          (put symbol 'standard-value