(rmail-mail-new-frame): Doc fix.

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index b5161bfcb99993a096d58b4811a7af0e7450755b..5e237cd0db7c756376b10710e7325965c4cf82d6 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -34,7 +34,7 @@
 
 ;;; Code:
 
-(let ((all '(;; abbrev.c 
+(let ((all '(;; abbrev.c
             (abbrev-all-caps abbrev-mode boolean)
             (pre-abbrev-expand-hook abbrev-mode hook)
             ;; alloc.c
@@ -54,8 +54,12 @@
             (truncate-lines display boolean)
             (selective-display-ellipses display boolean)
             (indicate-empty-lines display boolean "21.1")
-            (scroll-up-aggressively windows boolean "21.1")
-            (scroll-down-aggressively windows boolean "21.1")
+            (scroll-up-aggressively windows
+                                    (choice (const :tag "off" nil) number)
+                                    "21.1")
+            (scroll-down-aggressively windows
+                                      (choice (const :tag "off" nil) number)
+                                      "21.1")
             ;; callint.c
             (mark-even-if-inactive editing-basics boolean)
             ;; callproc.c
@@ -84,7 +88,7 @@
                            (function :value ignore))))
             (selection-coding-system mule coding-system)
             ;; dired.c
-            (completion-ignored-extensions dired 
+            (completion-ignored-extensions dired
                                            (repeat (string :format "%v")))
             ;; dispnew.c
             (baud-rate display integer)
@@ -102,7 +106,7 @@
                                                   :value (nil)
                                                   (symbol :format "%v"))
                                           (const :tag "always" t)))
-            (debug-on-error debug 
+            (debug-on-error debug
                             (choice (const :tag "off")
                                     (repeat :menu-tag "When"
                                             :value (nil)
@@ -119,6 +123,7 @@
             (insert-default-directory minibuffer boolean)
             ;; fns.c
             (use-dialog-box menu boolean "21.1")
+            (use-file-dialog menu boolean "21.4")
             ;; frame.c
             (default-frame-alist frames
               (repeat (cons :format "%v"
@@ -151,7 +156,7 @@
 ;; version-specific directories when you upgrade.  We need
 ;; customization of the front of the list, maintaining the standard
 ;; value intact at the back.
-;;;         (load-path environment 
+;;;         (load-path environment
 ;;;                    (repeat (choice :tag "[Current dir?]"
 ;;;                                    :format "%[Current dir?%] %v"
 ;;;                                    (const :tag " current dir" nil)
@@ -196,13 +201,15 @@
             ;; syntax.c
             (parse-sexp-ignore-comments editing-basics boolean)
             (words-include-escapes editing-basics boolean)
+            (open-paren-in-column-0-is-defun-start editing-basics boolean
+                                                   "21.1")
             ;; window.c
             (temp-buffer-show-function windows (choice (const nil) function))
             (display-buffer-function windows (choice (const nil) function))
             (pop-up-frames frames boolean)
             (pop-up-frame-function frames function)
-            (special-display-buffer-names 
-             frames 
+            (special-display-buffer-names
+             frames
              (repeat (choice :tag "Buffer"
                              :value ""
                              (string :format "%v")
@@ -215,7 +222,7 @@
                                                  (symbol :tag "Parameter")
                                                  (sexp :tag "Value")))))))
             (special-display-regexps
-             frames 
+             frames
              (repeat (choice :tag "Buffer"
                              :value ""
                              (regexp :format "%v")
@@ -250,12 +257,14 @@
             (line-number-display-limit display
                                        (choice integer
                                                (const :tag "No limit" nil)))
+            (line-number-display-limit-width display integer)
             (highlight-nonselected-windows display boolean)
             (message-log-max debug (choice (const :tag "Disable" nil)
                                            (integer :menu-tag "lines"
                                                     :format "%v")
                                            (other :tag "Unlimited" t)))
             (unibyte-display-via-language-environment mule boolean)
+            (blink-cursor-alist cursor alist "21.5")
             ;; xfaces.c
             (scalable-fonts-allowed display boolean)
             ;; xfns.c
@@ -279,7 +288,7 @@
                        (numberp sexp))
                    sexp
                  (list 'quote sexp)))))
-  (while all 
+  (while all
     (setq this (car all)
          all (cdr all)
          symbol (nth 0 this)
@@ -303,7 +312,7 @@
             (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 
+         (put symbol 'standard-value
               (list (funcall quoter (default-value symbol)))))
       ;; If this is NOT while dumping Emacs,
       ;; set up the rest of the customization info.
@@ -315,6 +324,8 @@
        (put symbol 'custom-version version)))))
 
 (custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable)
+(custom-add-to-group 'font-lock 'open-paren-in-column-0-is-defun-start
+                    'custom-variable)
 (put 'selection-coding-system 'custom-set
      (lambda (symbol value)
        (set-selection-coding-system value)
@@ -327,4 +338,5 @@
 (unless purify-flag
   (provide 'cus-start))
 
+;;; arch-tag: 4502730d-bcb3-4f5e-99a3-a86f2d54af60
 ;;; cus-start.el ends here