# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1291418427 18000
# Node ID 7a58c6c2656623049103b57c792c870d6915fafe
# Parent  e8c77965d85e5f9a69fae93cac7e8abb570839a0
* lisp/subr.el (with-demoted-errors): Distinguish symbols from strings.

diff -r e8c77965d85e -r 7a58c6c26566 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Dec 03 18:14:50 2010 -0500
+++ b/lisp/ChangeLog	Fri Dec 03 18:20:27 2010 -0500
@@ -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 -r e8c77965d85e -r 7a58c6c26566 lisp/subr.el
--- a/lisp/subr.el	Fri Dec 03 18:14:50 2010 -0500
+++ b/lisp/subr.el	Fri Dec 03 18:20:27 2010 -0500
@@ -2816,7 +2816,7 @@
   (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.