From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 3 Dec 2010 23:20:27 +0000 (-0500)
Subject: * lisp/subr.el (with-demoted-errors): Distinguish symbols from strings.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~45^2~48
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f0ea0ffc90f140cd6e19bc2adb25eb87f3e90d9;p=emacs.git

* lisp/subr.el (with-demoted-errors): Distinguish symbols from strings.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23d6130f2cb..d8aa0eb8398 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-12-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* subr.el (with-demoted-errors): Distinguish symbols from strings.
+
 	* newcomment.el (comment-styles): Add docs to each style (bug#7509).
 	Improve docstring.
 	(comment-style): Use comment-styles's docs to describe values.
diff --git a/lisp/subr.el b/lisp/subr.el
index 70d8b76faa5..ff65997c68c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2816,7 +2816,7 @@ but which should be robust in the unexpected case that an error is signaled."
   (let ((err (make-symbol "err")))
     `(condition-case-no-debug ,err
          (progn ,@body)
-       (error (message "Error: %s" ,err) nil))))
+       (error (message "Error: %S" ,err) nil))))
 
 (defmacro combine-after-change-calls (&rest body)
   "Execute BODY, but don't call the after-change functions till the end.