emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master c7ecc6b 1/2: Fix a bootstrap issue with unescaped character liter


From: Philipp Stephani
Subject: master c7ecc6b 1/2: Fix a bootstrap issue with unescaped character literal detection.
Date: Sun, 12 Apr 2020 07:59:27 -0400 (EDT)

branch: master
commit c7ecc6bbc03af4c2746e2e8765dbbe5bf4a3a908
Author: Philipp Stephani <address@hidden>
Commit: Philipp Stephani <address@hidden>

    Fix a bootstrap issue with unescaped character literal detection.
    
    * src/lread.c (load_warn_unescaped_character_literals): Deal with the
    case that 'byte-run--unescaped-character-literals-warning' isn't yet
    defined.
---
 src/lread.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lread.c b/src/lread.c
index eabf3b9..8ec9e32 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1030,7 +1030,13 @@ load_error_handler (Lisp_Object data)
 static void
 load_warn_unescaped_character_literals (Lisp_Object file)
 {
-  Lisp_Object warning = call0 (Qbyte_run_unescaped_character_literals_warning);
+  Lisp_Object function
+    = Fsymbol_function (Qbyte_run_unescaped_character_literals_warning);
+  /* If byte-run.el is being loaded,
+     `byte-run--unescaped-character-literals-warning' isn't yet
+     defined.  Since it'll be byte-compiled later, ignore potential
+     unescaped character literals. */
+  Lisp_Object warning = NILP (function) ? Qnil : call0 (function);
   if (!NILP (warning))
     {
       AUTO_STRING (format, "Loading `%s': %s");



reply via email to

[Prev in Thread] Current Thread [Next in Thread]