procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve error message for old-style backquotes

Browse source 
* src/lread.c (load_error_old_style_backquotes): Improve error message
if no file is being loaded.

* test/src/lread-tests.el (lread-tests--force-new-style-backquotes):
Adapt test.
This commit is contained in:
Philipp Stephani 2017-12-29 21:58:07 +01:00
parent ddb74b2027
commit 378be8df8d
2 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/lread.c
View file

@ -1006,8 +1006,16 @@ load_error_handler (Lisp_Object data)
static _Noreturn void
load_error_old_style_backquotes (void)
{
AUTO_STRING (format, "Loading `%s': old-style backquotes detected!");
xsignal1 (Qerror, CALLN (Fformat_message, format, Vload_file_name));
if (NILP (Vload_file_name))
{
AUTO_STRING (message, "Old-style backquotes detected!");
xsignal1 (Qerror, message);
}
else
{
AUTO_STRING (format, "Loading `%s': old-style backquotes detected!");
xsignal1 (Qerror, CALLN (Fformat_message, format, Vload_file_name));
}
}
static void

3
test/src/lread-tests.el
View file

@ -183,8 +183,7 @@ literals (Bug#20852)."
(ert-deftest lread-tests--force-new-style-backquotes ()
(let ((data (should-error (read "(` (a b))"))))
(should (equal (cdr data)
'("Loading `nil': old-style backquotes detected!"))))
(should (equal (cdr data) '("Old-style backquotes detected!"))))
(should (equal (let ((force-new-style-backquotes t))
(read "(` (a b))"))
'(`(a b)))))