emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] emacs-26 4fd446e: Fix tempfile creation when byte compilin


From: Paul Eggert
Subject: [Emacs-diffs] emacs-26 4fd446e: Fix tempfile creation when byte compiling
Date: Fri, 19 Jan 2018 17:41:02 -0500 (EST)

branch: emacs-26
commit 4fd446e9f65e5531b18d4a0c5e08a6eeabc292d8
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Fix tempfile creation when byte compiling
    
    This improves on the recent fix for master failing to build
    on FreeBSD.  Suggested by Stefan Monnier in:
    https://lists.gnu.org/r/emacs-devel/2018-01/msg00600.html
    * 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, 1 insertion(+), 11 deletions(-)

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 700a7c1..f6d259b 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1933,17 +1933,7 @@ 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
-                        (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))))
+                       (make-temp-file (expand-file-name 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]