emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] emacs-26 b603aff: Revert "Fix tempfile creation when byte


From: Eli Zaretskii
Subject: [Emacs-diffs] emacs-26 b603aff: Revert "Fix tempfile creation when byte compiling"
Date: Sat, 20 Jan 2018 02:50:23 -0500 (EST)

branch: emacs-26
commit b603affa1fdd6c85cb5513dcc9606fd0b82567f2
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Revert "Fix tempfile creation when byte compiling"
    
    This reverts commit 4fd446e9f65e5531b18d4a0c5e08a6eeabc292d8:
    * lisp/emacs-lisp/bytecomp.el (byte-compile-file):
    Put tempfile next to the target file, as was the original intent.
---
 lisp/emacs-lisp/bytecomp.el | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index f6d259b..700a7c1 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1933,7 +1933,17 @@ The value is non-nil if there were no errors, nil if 
errors."
                       ;; parallel bootstrap), it does not risk getting a
                       ;; half-finished file.  (Bug#4196)
                       (tempfile
-                       (make-temp-file (expand-file-name target-file)))
+                        (if (file-name-absolute-p target-file)
+                            (make-temp-file target-file)
+                          ;; If target-file is relative and includes
+                          ;; leading directories, make-temp-file will
+                          ;; assume those leading directories exist
+                          ;; under temporary-file-directory, which might
+                          ;; not be true.  So strip leading directories
+                          ;; from relative file names before calling
+                          ;; make-temp-file.
+                          (make-temp-file
+                           (file-name-nondirectory target-file))))
                       (default-modes (default-file-modes))
                       (temp-modes (logand default-modes #o600))
                       (desired-modes (logand default-modes #o666))



reply via email to

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