aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2019-04-19 12:08:40 -0700
committerPaul Eggert2019-04-19 12:08:54 -0700
commit5e3e14f6e96fd99ac763bedccb0539551dcb1d29 (patch)
treecf5f08c93f1a13ae876e021c7aeaa6c611efa9d5 /src
parenta33308a297125e7e804ebafb7d942c10aaa2c3c1 (diff)
downloademacs-5e3e14f6e96fd99ac763bedccb0539551dcb1d29.tar.gz
emacs-5e3e14f6e96fd99ac763bedccb0539551dcb1d29.zip
Minor lread.c tweaks
* src/lread.c (load_warn_unescaped_character_literals): Use AUTO_STRING to help the GC. (Fload): Use bool for boolean.
Diffstat (limited to 'src')
-rw-r--r--src/lread.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lread.c b/src/lread.c
index 8b38cacde07..f83db2ac9f9 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1034,12 +1034,12 @@ load_error_old_style_backquotes (void)
1034static void 1034static void
1035load_warn_unescaped_character_literals (Lisp_Object file) 1035load_warn_unescaped_character_literals (Lisp_Object file)
1036{ 1036{
1037 Lisp_Object warning 1037 Lisp_Object warning = call0 (Qbyte_run_unescaped_character_literals_warning);
1038 = call0 (Qbyte_run_unescaped_character_literals_warning); 1038 if (!NILP (warning))
1039 if (NILP (warning)) 1039 {
1040 return; 1040 AUTO_STRING (format, "Loading `%s': %s");
1041 Lisp_Object format = build_string ("Loading `%s': %s"); 1041 CALLN (Fmessage, format, file, warning);
1042 CALLN (Fmessage, format, file, warning); 1042 }
1043} 1043}
1044 1044
1045DEFUN ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0, 1045DEFUN ("get-load-suffixes", Fget_load_suffixes, Sget_load_suffixes, 0, 0, 0,
@@ -1301,8 +1301,8 @@ Return t if the file exists and loads successfully. */)
1301 specbind (Qlread_unescaped_character_literals, Qnil); 1301 specbind (Qlread_unescaped_character_literals, Qnil);
1302 record_unwind_protect (load_warn_unescaped_character_literals, file); 1302 record_unwind_protect (load_warn_unescaped_character_literals, file);
1303 1303
1304 int is_elc; 1304 bool is_elc = suffix_p (found, ".elc");
1305 if ((is_elc = suffix_p (found, ".elc")) != 0 1305 if (is_elc
1306 /* version = 1 means the file is empty, in which case we can 1306 /* version = 1 means the file is empty, in which case we can
1307 treat it as not byte-compiled. */ 1307 treat it as not byte-compiled. */
1308 || (fd >= 0 && (version = safe_to_load_version (fd)) > 1)) 1308 || (fd >= 0 && (version = safe_to_load_version (fd)) > 1))