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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 23d6130f2cb5c53559c2a4cd64785065edf22e1a..d8aa0eb839893696c91aae45f4a04e02cbc44ef2 100644 (file)
--- 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 70d8b76faa510b9f56768a297afdacb3e30e5457..ff65997c68c9a067864a1f998157b3ffa1c21089 100644 (file)
--- 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.