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.texibb748b3
Minor improvement in wording of the Emacs manualb603aff
Revert "Fix tempfile creation when byte compiling"4fd446e
Fix tempfile creation when byte compiling7f48a11
Improve the Emacs manual as suggested in emacs-manual-bugs728ded0
* lisp/emacs-lisp/bytecomp.el: Tweak last changec6c05e2
Unbreak building Emacs on FreeBSDa41ad3d
Don't unnecessarily use non-ASCII characters in C sourcesc28d4b6
Portability fixes in emacs-module-tests1d50c18
Add tests for term.el
This commit is contained in:
commit
60d5a13d28
14 changed files with 215 additions and 48 deletions
|
@ -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))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue