[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 39aaf88: Fix over-substitution of quotes on error
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 39aaf88: Fix over-substitution of quotes on error |
Date: |
Thu, 1 Sep 2016 06:06:20 +0000 (UTC) |
branch: master
commit 39aaf88feb564bc1d5150ccf53da71d7809a217a
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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.
---
src/print.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/print.c b/src/print.c
index 5531210..d54a7c9 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;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 39aaf88: Fix over-substitution of quotes on error,
Paul Eggert <=