aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Love2000-09-04 09:41:48 +0000
committerDave Love2000-09-04 09:41:48 +0000
commita033ea13a3aafd9595267896825e9e5b7a6f38df (patch)
treebd27195deba03d223d0b1dec7c53bd93b38fb634
parent1d8696347369a4fc53e82efd4e2e597ecb0bdefb (diff)
downloademacs-a033ea13a3aafd9595267896825e9e5b7a6f38df.tar.gz
emacs-a033ea13a3aafd9595267896825e9e5b7a6f38df.zip
(custom-set-variables): Print message about errors in
setting.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/custom.el7
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 272366e267f..fff537222b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12000-09-04 Dave Love <fx@gnu.org>
2
3 * wid-edit.el (widget-sexp-validate): Fix garbled code.
4
5 * custom.el (custom-set-variables): Print message about errors in
6 setting.
7
12000-09-03 Andrew Innes <andrewi@gnu.org> 82000-09-03 Andrew Innes <andrewi@gnu.org>
2 9
3 * makefile.w32-in: Change to DOS line endings. 10 * makefile.w32-in: Change to DOS line endings.
diff --git a/lisp/custom.el b/lisp/custom.el
index a724d497f59..ea7afc45fc5 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -458,8 +458,8 @@ COMMENT is a comment string about SYMBOL."
458 (put symbol 'saved-value (list value)) 458 (put symbol 'saved-value (list value))
459 (put symbol 'saved-variable-comment comment) 459 (put symbol 'saved-variable-comment comment)
460 ;; Allow for errors in the case where the setter has 460 ;; Allow for errors in the case where the setter has
461 ;; changed between versions, say. 461 ;; changed between versions, say, but let the user know.
462 (condition-case nil 462 (condition-case data
463 (cond (now 463 (cond (now
464 ;; Rogue variable, set it now. 464 ;; Rogue variable, set it now.
465 (put symbol 'force-value t) 465 (put symbol 'force-value t)
@@ -467,7 +467,8 @@ COMMENT is a comment string about SYMBOL."
467 ((default-boundp symbol) 467 ((default-boundp symbol)
468 ;; Something already set this, overwrite it. 468 ;; Something already set this, overwrite it.
469 (funcall set symbol (eval value)))) 469 (funcall set symbol (eval value))))
470 (error nil)) 470 (error
471 (message "Error setting %s: %s" symbol data)))
471 (setq args (cdr args)) 472 (setq args (cdr args))
472 (and (or now (default-boundp symbol)) 473 (and (or now (default-boundp symbol))
473 (put symbol 'variable-comment comment))) 474 (put symbol 'variable-comment comment)))