changeset 33774:77d48dfb2b29

(custom-buffer-create-internal): Save some consing. (custom-variable-set): Improve validation error mesage.
author Dave Love <fx@gnu.org>
date Wed, 22 Nov 2000 17:52:24 +0000
parents b4aa82f6177e
children 2c8dc85faf92
files lisp/cus-edit.el
diffstat 1 files changed, 17 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/cus-edit.el	Wed Nov 22 17:33:21 2000 +0000
+++ b/lisp/cus-edit.el	Wed Nov 22 17:52:24 2000 +0000
@@ -1297,14 +1297,13 @@
 		 :tag "Finish"
 		 :help-echo
 		 (lambda (&rest ignore)
-		   (concat (cond
-			    ((eq custom-buffer-done-function
-				 'custom-bury-buffer)
-			     "Bury")
-			    ((eq custom-buffer-done-function 'kill-buffer)
-			     "Kill")
-			    (t "Finish with"))		    
-			   " the buffer."))
+		   (cond
+		    ((eq custom-buffer-done-function
+			 'custom-bury-buffer)
+		     "Bury this buffer")
+		    ((eq custom-buffer-done-function 'kill-buffer)
+		     "Kill this buffer")
+		    (t "Finish with this buffer")))
 		 :action #'Custom-buffer-done)
   (widget-insert "\n\n")
   (message "Creating customization items...")
@@ -1322,18 +1321,18 @@
 	  (let ((count 0)
 		(length (length options)))
 	    (mapcar (lambda (entry)
-			(prog2
-			    (message "Creating customization items ...%2d%%"
-				     (/ (* 100.0 count) length))
-			    (widget-create (nth 1 entry)
+		      (prog2
+			  (message "Creating customization items ...%2d%%"
+				   (/ (* 100.0 count) length))
+			  (widget-create (nth 1 entry)
 					 :tag (custom-unlispify-tag-name
 					       (nth 0 entry))
 					 :value (nth 0 entry))
-			  (setq count (1+ count))
-			  (unless (eq (preceding-char) ?\n)
-			    (widget-insert "\n"))
-			  (widget-insert "\n")))
-		      options))))
+			(setq count (1+ count))
+			(unless (eq (preceding-char) ?\n)
+			  (widget-insert "\n"))
+			(widget-insert "\n")))
+		    options))))
   (unless (eq (preceding-char) ?\n)
     (widget-insert "\n"))
   (message "Creating customization items ...%2d%%done" 100)
@@ -2379,7 +2378,7 @@
 	   (error "Cannot set hidden variable"))
 	  ((setq val (widget-apply child :validate))
 	   (goto-char (widget-get val :from))
-	   (error "%s" (widget-get val :error)))
+	   (error "Saving %s: %s" symbol (widget-get val :error)))
 	  ((memq form '(lisp mismatch))
 	   (when (equal comment "")
 	     (setq comment nil)