X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/3920868a41a77ff596b9eba61220df991eb03043..6a70ef0d8173b57817bcc8a013eb86c8583e74fc:/lisp/custom.el

diff --git a/lisp/custom.el b/lisp/custom.el
index de757f8b3e..ea7afc45fc 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -5,7 +5,6 @@
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
 ;; Keywords: help, faces
-;; X-URL: http://www.dina.kvl.dk/~abraham/custom/ (probably obsolete)
 
 ;; This file is part of GNU Emacs.
 
@@ -110,7 +109,6 @@ not the default value itself."
   (put symbol 'standard-value (list default))
   ;; Maybe this option was rogue in an earlier version.  It no longer is.
   (when (get symbol 'force-value)
-    ;; It no longer is.
     (put symbol 'force-value nil))
   (when doc
     (put symbol 'variable-documentation doc))
@@ -187,6 +185,10 @@ The following keywords are meaningful:
 	VALUE should be a feature symbol.  If you save a value
 	for this option, then when your `.emacs' file loads the value,
 	it does (require VALUE) first.
+:version
+        VALUE should be a string specifying that the variable was
+        first introduced, or its default value was changed, in Emacs
+        version VERSION.
 
 Read the section about customization in the Emacs Lisp manual for more
 information."
@@ -300,10 +302,13 @@ The remaining arguments should have the form
 
    [KEYWORD VALUE]...
 
-The following KEYWORD's are defined:
+The following KEYWORDs are defined:
 
-:group  VALUE should be a customization group.
-        Add SYMBOL to that group.
+:group   VALUE should be a customization group.
+         Add SYMBOL to that group.
+
+:version VALUE should be a string specifying that the group was introduced
+         in Emacs version VERSION.
 
 Read the section about customization in the Emacs Lisp manual for more
 information."
@@ -453,8 +458,8 @@ COMMENT is a comment string about SYMBOL."
 	    (put symbol 'saved-value (list value))
 	    (put symbol 'saved-variable-comment comment)
 	    ;; Allow for errors in the case where the setter has
-	    ;; changed between versions, say.
-	    (condition-case nil
+	    ;; changed between versions, say, but let the user know.
+	    (condition-case data
 		(cond (now
 		       ;; Rogue variable, set it now.
 		       (put symbol 'force-value t)
@@ -462,7 +467,8 @@ COMMENT is a comment string about SYMBOL."
 		      ((default-boundp symbol)
 		       ;; Something already set this, overwrite it.
 		       (funcall set symbol (eval value))))
-	      (error nil))
+	      (error 
+	       (message "Error setting %s: %s" symbol data)))
 	    (setq args (cdr args))
 	    (and (or now (default-boundp symbol))
 		 (put symbol 'variable-comment comment)))