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

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.

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.