aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2018-01-19 14:37:31 -0800
committerPaul Eggert2018-01-19 14:40:56 -0800
commit4fd446e9f65e5531b18d4a0c5e08a6eeabc292d8 (patch)
treee9b6a1209ef114e899c637f07fba954fc35395e4
parent7f48a11216fc12f1aef8158f82e5a0a0706f51af (diff)
downloademacs-4fd446e9f65e5531b18d4a0c5e08a6eeabc292d8.tar.gz
emacs-4fd446e9f65e5531b18d4a0c5e08a6eeabc292d8.zip
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.
-rw-r--r--lisp/emacs-lisp/bytecomp.el12
1 files changed, 1 insertions, 11 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 700a7c16b58..f6d259ba9da 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."
1933 ;; parallel bootstrap), it does not risk getting a 1933 ;; parallel bootstrap), it does not risk getting a
1934 ;; half-finished file. (Bug#4196) 1934 ;; half-finished file. (Bug#4196)
1935 (tempfile 1935 (tempfile
1936 (if (file-name-absolute-p target-file) 1936 (make-temp-file (expand-file-name target-file)))
1937 (make-temp-file target-file)
1938 ;; If target-file is relative and includes
1939 ;; leading directories, make-temp-file will
1940 ;; assume those leading directories exist
1941 ;; under temporary-file-directory, which might
1942 ;; not be true. So strip leading directories
1943 ;; from relative file names before calling
1944 ;; make-temp-file.
1945 (make-temp-file
1946 (file-name-nondirectory target-file))))
1947 (default-modes (default-file-modes)) 1937 (default-modes (default-file-modes))
1948 (temp-modes (logand default-modes #o600)) 1938 (temp-modes (logand default-modes #o600))
1949 (desired-modes (logand default-modes #o666)) 1939 (desired-modes (logand default-modes #o666))