emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] master 617f4f3: Fix loading .elc files on MS-Windows


From: Eli Zaretskii
Subject: [Emacs-diffs] master 617f4f3: Fix loading .elc files on MS-Windows
Date: Wed, 18 Sep 2019 14:47:06 -0400 (EDT)

branch: master
commit 617f4f31a09f974b0c9cbac903643ee553e5eaa8
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Fix loading .elc files on MS-Windows
    
    * src/lread.c (Fload): Don't clobber 'found' if the .el file
    was not found, as it is used by WINDOWSNT later on.
---
 src/lread.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/lread.c b/src/lread.c
index ab0fab4..99e0ce3 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1343,6 +1343,7 @@ Return t if the file exists and loads successfully.  */)
           /* openp already checked for newness, no point doing it again.
              FIXME would be nice to get a message when openp
              ignores suffix order due to load_prefer_newer.  */
+         Lisp_Object notfound = found;
           if (!load_prefer_newer && is_elc)
             {
               result = stat (SSDATA (efound), &s1);
@@ -1354,11 +1355,11 @@ Return t if the file exists and loads successfully.  */)
                  err = errno;
                   SSET (efound, SBYTES (efound) - 1, 'c');
                  if (result != 0)
-                   found = Fsubstring (found, make_fixnum (0),
-                                       make_fixnum (-1));
+                   notfound = Fsubstring (found, make_fixnum (0),
+                                          make_fixnum (-1));
                 }
              if (result != 0)
-               file_test_errno (found, err);
+               file_test_errno (notfound, err);
              else if (timespec_cmp (get_stat_mtime (&s1),
                                     get_stat_mtime (&s2))
                       < 0)



reply via email to

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