diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-31 23:05:48 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-31 23:06:16 -0700 |
commit | 39aaf88feb564bc1d5150ccf53da71d7809a217a (patch) | |
tree | aa371d7ae01df6bb7e3dfb73a6bb190e64096c4e | |
parent | 64507149f4296029ab80c2caa97ec0f76264bdbb (diff) |
Fix over-substitution of quotes on error
Problem reported by Tino Calancha in:
http://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00000.html
* src/print.c (print_error_message):
Substitute quotes in errmsg only when gotten from a property.
-rw-r--r-- | src/print.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/print.c b/src/print.c index 5531210e1b..d54a7c9bdd 100644 --- a/src/print.c +++ b/src/print.c @@ -920,7 +920,7 @@ print_error_message (Lisp_Object data, Lisp_Object stream, const char *context, else { Lisp_Object error_conditions = Fget (errname, Qerror_conditions); - errmsg = Fget (errname, Qerror_message); + errmsg = Fsubstitute_command_keys (Fget (errname, Qerror_message)); file_error = Fmemq (Qfile_error, error_conditions); } @@ -939,7 +939,7 @@ print_error_message (Lisp_Object data, Lisp_Object stream, const char *context, if (!STRINGP (errmsg)) write_string_1 ("peculiar error", stream); else if (SCHARS (errmsg)) - Fprinc (Fsubstitute_command_keys (errmsg), stream); + Fprinc (errmsg, stream); else sep = NULL; |