diff options
Diffstat (limited to 'lisp/cus-start.el')
| -rw-r--r-- | lisp/cus-start.el | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 9dcea001ae5..11ca245ffaf 100644 --- 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) @@ -291,7 +292,7 @@ since it could result in memory overflow and make Emacs crash." (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) @@ -300,8 +301,6 @@ since it could result in memory overflow and make Emacs crash." (and (listp sexp) (memq (car sexp) '(lambda))) (stringp sexp) -;; (and (fboundp 'characterp) -;; (characterp sexp)) (numberp sexp)) sexp (list 'quote sexp))))) @@ -312,6 +311,12 @@ since it could result in memory overflow and make Emacs crash." 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 @@ -329,8 +334,7 @@ since it could result in memory overflow and make Emacs crash." (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 |