Revert arch-tagline change

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

diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index e59e416..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,6 +39,8 @@
             (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)
             (undo-outer-limit undo
@@ -52,7 +54,6 @@ This should only be chosen under exceptional circumstances,
 since it could result in memory overflow and make Emacs crash."
                                              nil))
                               "22.1")
-            (garbage-collection-messages alloc boolean)
             ;; buffer.c
             (mode-line-format modeline sexp) ;Hard to do right.
             (default-major-mode internal function)
@@ -311,7 +312,8 @@ since it could result in memory overflow and make Emacs crash."
          ;; use the current value as the standard value.
          standard (if (nthcdr 4 this)
                       (nth 4 this)
-                    (funcall quoter (default-value symbol)))
+                    (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