diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-01-20 08:23:30 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-01-20 08:23:30 -0800 |
| commit | 60d5a13d28705e116e0a69c48f15d20aab9d3081 (patch) | |
| tree | 3536dd2a4f35997d27c0bb3806e9a0cf7800a5de /lisp/emacs-lisp | |
| parent | 194c530034e9413071bcdc92d573b2916363ebf1 (diff) | |
| parent | cfc94fd245076ee0fba49083a55b08bbadfec4eb (diff) | |
| download | emacs-60d5a13d28705e116e0a69c48f15d20aab9d3081.tar.gz emacs-60d5a13d28705e116e0a69c48f15d20aab9d3081.tar.bz2 emacs-60d5a13d28705e116e0a69c48f15d20aab9d3081.zip | |
Merge from origin/emacs-26
cfc94fd (origin/emacs-26) Don't mention 'vc-stay-local' in the user m...
8ce430b Fix a typo in calendar.texi
bb748b3 Minor improvement in wording of the Emacs manual
b603aff Revert "Fix tempfile creation when byte compiling"
4fd446e Fix tempfile creation when byte compiling
7f48a11 Improve the Emacs manual as suggested in emacs-manual-bugs
728ded0 * lisp/emacs-lisp/bytecomp.el: Tweak last change
c6c05e2 Unbreak building Emacs on FreeBSD
a41ad3d Don't unnecessarily use non-ASCII characters in C sources
c28d4b6 Portability fixes in emacs-module-tests
1d50c18 Add tests for term.el
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/bytecomp.el | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index cc3a24e3d51..80eb6489c31 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 (file-name-nondirectory 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)) |