aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2021-11-12 09:47:44 +0200
committerEli Zaretskii2021-11-12 09:47:44 +0200
commit766f636a72d890c0304cbbf49b7e1391aba0f406 (patch)
tree14765529a99946225839226df0184800e8f77a11 /src
parent0c3bf6ce110eeaaf9dbb265b31598b837a257937 (diff)
downloademacs-766f636a72d890c0304cbbf49b7e1391aba0f406.tar.gz
emacs-766f636a72d890c0304cbbf49b7e1391aba0f406.zip
; * src/lread.c (safe_to_load_version, Fload): Fix coding style.
Diffstat (limited to 'src')
-rw-r--r--src/lread.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lread.c b/src/lread.c
index 39cab19fc00..3052bcbd063 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1054,7 +1054,7 @@ safe_to_load_version (Lisp_Object file, int fd)
1054 1054
1055 /* If the file is not regular, then we cannot safely seek it. 1055 /* If the file is not regular, then we cannot safely seek it.
1056 Assume that it is not safe to load as a compiled file. */ 1056 Assume that it is not safe to load as a compiled file. */
1057 if (fstat(fd, &st) == 0 && !S_ISREG (st.st_mode)) 1057 if (fstat (fd, &st) == 0 && !S_ISREG (st.st_mode))
1058 return 0; 1058 return 0;
1059 1059
1060 /* Read the first few bytes from the file, and look for a line 1060 /* Read the first few bytes from the file, and look for a line
@@ -1418,11 +1418,8 @@ Return t if the file exists and loads successfully. */)
1418 struct stat s1, s2; 1418 struct stat s1, s2;
1419 int result; 1419 int result;
1420 1420
1421 if (version < 0 1421 if (version < 0 && !(version = safe_to_load_version (file, fd)))
1422 && ! (version = safe_to_load_version (file, fd))) 1422 error ("File `%s' was not compiled in Emacs", SDATA (found));
1423 {
1424 error ("File `%s' was not compiled in Emacs", SDATA (found));
1425 }
1426 1423
1427 compiled = 1; 1424 compiled = 1;
1428 1425