summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2019-09-18 05:17:03 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2019-09-18 05:18:58 -0700
commit9597ee68d999d43145d47ff53e1474f1493f8727 (patch)
tree3b93b2c431a6aaaf1695841894f64f4e172943c9 /src
parent98586c2fe62fd26bc9105a06b78d93446bd2a269 (diff)
downloademacs-9597ee68d999d43145d47ff53e1474f1493f8727.tar.gz
Out-of-datedness .elc check is merely a file test
* src/fileio.c (file_test_errno): Now extern. * src/lread.c (Fload): Use file_test_errno instead, since this is really just a file test (the attributes are not given to the user).
Diffstat (limited to 'src')
-rw-r--r--src/fileio.c2
-rw-r--r--src/lisp.h1
-rw-r--r--src/lread.c2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/fileio.c b/src/fileio.c
index 53eecc31aaf..5337ea5c800 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -265,7 +265,7 @@ file_attribute_errno (Lisp_Object file, int err)
enum { PICKY_EACCES = false };
#endif
-static Lisp_Object
+Lisp_Object
file_test_errno (Lisp_Object file, int err)
{
if (!PICKY_EACCES && err == EACCES)
diff --git a/src/lisp.h b/src/lisp.h
index e68d2732e21..b081ae1cee8 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4315,6 +4315,7 @@ extern AVOID report_file_errno (const char *, Lisp_Object, int);
extern AVOID report_file_error (const char *, Lisp_Object);
extern AVOID report_file_notify_error (const char *, Lisp_Object);
extern Lisp_Object file_attribute_errno (Lisp_Object, int);
+extern Lisp_Object file_test_errno (Lisp_Object, int);
extern bool internal_delete_file (Lisp_Object);
extern Lisp_Object check_emacs_readlinkat (int, Lisp_Object, char const *);
extern bool file_directory_p (Lisp_Object);
diff --git a/src/lread.c b/src/lread.c
index d8883db46c1..ab0fab47a98 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1358,7 +1358,7 @@ Return t if the file exists and loads successfully. */)
make_fixnum (-1));
}
if (result != 0)
- file_attribute_errno (found, err);
+ file_test_errno (found, err);
else if (timespec_cmp (get_stat_mtime (&s1),
get_stat_mtime (&s2))
< 0)