[Emacs-diffs] Changes to emacs/lisp/cus-start.el

[Richard M . Stallman]

Index: emacs/lisp/cus-start.el
diff -c emacs/lisp/cus-start.el:1.64 emacs/lisp/cus-start.el:1.65
*** emacs/lisp/cus-start.el:1.64        Wed Feb  9 15:50:43 2005
--- emacs/lisp/cus-start.el     Mon Feb 14 09:49:38 2005
***************
*** 288,294 ****
               (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 function turns a value
        ;; into an expression which produces that value.
        (quoter (lambda (sexp)
--- 288,294 ----
               (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 standard version native-p
        ;; This function turns a value
        ;; into an expression which produces that value.
        (quoter (lambda (sexp)
***************
*** 297,304 ****
                        (and (listp sexp)
                             (memq (car sexp) '(lambda)))
                        (stringp sexp)
- ;;                    (and (fboundp 'characterp)
- ;;                         (characterp sexp))
                        (numberp sexp))
                    sexp
                  (list 'quote sexp)))))
--- 297,302 ----
***************
*** 309,314 ****
--- 307,317 ----
          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)
+                    (funcall quoter (default-value symbol)))
          ;; Don't complain about missing variables which are
          ;; irrelevant to this platform.
          native-p (save-match-data
***************
*** 326,333 ****
             (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)))))
        ;; If this is NOT while dumping Emacs,
        ;; set up the rest of the customization info.
        (unless purify-flag
--- 329,335 ----
             (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 standard)))
        ;; If this is NOT while dumping Emacs,
        ;; set up the rest of the customization info.
        (unless purify-flag