Revert arch-tagline change

[bpt/emacs.git] / lisp / cus-start.el

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index db044fc..36bebf6 100644 (file)
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,6 +1,6 @@
 ;;; cus-start.el --- define customization properties of builtins
 ;;
-;; Copyright (C) 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2005 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
@@ -39,9 +39,21 @@
             (pre-abbrev-expand-hook abbrev-mode hook)
             ;; alloc.c
             (gc-cons-threshold alloc integer)
+            (garbage-collection-messages alloc boolean)
+            ;; undo.c
             (undo-limit undo integer)
             (undo-strong-limit undo integer)
-            (garbage-collection-messages alloc boolean)
+            (undo-outer-limit undo
+                              (choice integer
+                                      (const :tag "No limit"
+                                             :format "%t\n%d"
+                                             :doc
+                                             "With this choice, \
+the undo info for the current command never gets discarded.
+This should only be chosen under exceptional circumstances,
+since it could result in memory overflow and make Emacs crash."
+                                             nil))
+                              "22.1")
             ;; buffer.c
             (mode-line-format modeline sexp) ;Hard to do right.
             (default-major-mode internal function)
@@ -121,8 +133,10 @@
                                    (const :tag "always" t)))
             ;; fileio.c
             (insert-default-directory minibuffer boolean)
+            (read-file-name-completion-ignore-case minibuffer boolean "22.1")
             ;; fns.c
             (use-dialog-box menu boolean "21.1")
+            (use-file-dialog menu boolean "22.1")
             ;; frame.c
             (default-frame-alist frames
               (repeat (cons :format "%v"
@@ -166,6 +180,7 @@
             (history-length minibuffer
                             (choice (const :tag "Infinite" t)
                                     integer))
+            (history-delete-duplicates minibuffer boolean)
             (minibuffer-prompt-properties
              minibuffer
              (list
@@ -263,17 +278,18 @@
                                                     :format "%v")
                                            (other :tag "Unlimited" t)))
             (unibyte-display-via-language-environment mule boolean)
-            (blink-cursor-alist cursor alist "21.5")
+            (blink-cursor-alist cursor alist "22.1")
             ;; xfaces.c
             (scalable-fonts-allowed display boolean)
             ;; xfns.c
             (x-bitmap-file-path installation
                                 (repeat (directory :format "%v")))
+            (x-use-old-gtk-file-dialog menu boolean "22.1")
             ;; xterm.c
              (mouse-autoselect-window display boolean "21.3")
             (x-use-underline-position-properties display boolean "21.3")
             (x-stretch-cursor display boolean "21.1")))
-      this symbol group type native-p version
+      this symbol group type standard version native-p
       ;; This function turns a value
       ;; into an expression which produces that value.
       (quoter (lambda (sexp)
@@ -282,8 +298,6 @@
                        (and (listp sexp)
                             (memq (car sexp) '(lambda)))
                        (stringp sexp)
-;;                     (and (fboundp 'characterp)
-;;                          (characterp sexp))
                        (numberp sexp))
                    sexp
                  (list 'quote sexp)))))
@@ -294,6 +308,12 @@
          group (nth 1 this)
          type (nth 2 this)
          version (nth 3 this)
+         ;; If we did not specify any standard value expression above,
+         ;; use the current value as the standard value.
+         standard (if (nthcdr 4 this)
+                      (nth 4 this)
+                    (when (default-boundp symbol)
+                      (funcall quoter (default-value symbol))))
          ;; Don't complain about missing variables which are
          ;; irrelevant to this platform.
          native-p (save-match-data
@@ -311,8 +331,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
-              (list (funcall quoter (default-value symbol)))))
+         (put symbol 'standard-value (list standard)))
       ;; If this is NOT while dumping Emacs,
       ;; set up the rest of the customization info.
       (unless purify-flag