Mercurial > emacs

changeset 23354:4a3a39dff0ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(custom-set-variables): Load the requests first, then check the symbol's `set' function.
author Karl Heuer <kwzh@gnu.org>
date Wed, 30 Sep 1998 19:15:17 +0000
parents 2a5d306408cb
children 4486a6940607
files lisp/custom.el
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/custom.el	Wed Sep 30 19:07:17 1998 +0000
+++ b/lisp/custom.el	Wed Sep 30 19:15:17 1998 +0000
@@ -408,7 +408,11 @@
 		 (value (nth 1 entry))
 		 (now (nth 2 entry))
 		 (requests (nth 3 entry))
-		 (set (or (get symbol 'custom-set) 'custom-set-default)))
+		 set)
+	    (when requests
+	      (put symbol 'custom-requests requests)
+	      (mapcar 'require requests))
+	    (setq set (or (get symbol 'custom-set) 'custom-set-default))
 	    (put symbol 'saved-value (list value))
 	    (cond (now 
 		   ;; Rogue variable, set it now.
@@ -417,9 +421,6 @@
 		  ((default-boundp symbol)
 		   ;; Something already set this, overwrite it.
 		   (funcall set symbol (eval value))))
-	    (when requests
-	      (put symbol 'custom-requests requests)
-	      (mapcar 'require requests))
 	    (setq args (cdr args)))
 	;; Old format, a plist of SYMBOL VALUE pairs.
 	(message "Warning: old format `custom-set-variables'")