summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-01-20 19:12:05 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2018-01-20 19:18:49 -0800
commit64c846738617d1d037eac0cefb6586c04317b0a1 (patch)
tree763700c43f3d16d233f4c194164b6f8f50d7a63e
parentf0c1277af5efafbc5e386affabc1ec3368e8a790 (diff)
downloademacs-64c846738617d1d037eac0cefb6586c04317b0a1.tar.gz
emacs-64c846738617d1d037eac0cefb6586c04317b0a1.tar.bz2
emacs-64c846738617d1d037eac0cefb6586c04317b0a1.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 80eb6489c31..a64c88c4f0d 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))