summaryrefslogtreecommitdiff
path: root/lisp/emerge.el
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-06-23 07:05:34 +0000
committerGerd Moellmann <gerd@gnu.org>2000-06-23 07:05:34 +0000
commitdb51a0f480cc9d363bfd4d68b57e8fcc830cbbd0 (patch)
treebc3e9c7002dc9e7bc6a4c8fcbef449f0a8d0f435 /lisp/emerge.el
parent1ca378b8cea2375d1fac94e2c4716cd0cc216eab (diff)
downloademacs-db51a0f480cc9d363bfd4d68b57e8fcc830cbbd0.tar.gz
(emerge-make-temp-file): Make sure file has proper
permissions from birth.
Diffstat (limited to 'lisp/emerge.el')
-rw-r--r--lisp/emerge.el8
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el
index b876c1c1192..332c8b46995 100644
--- a/lisp/emerge.el
+++ b/lisp/emerge.el
@@ -2907,8 +2907,12 @@ keymap. Leaves merge in fast mode."
;; Make a temporary file that only we have access to.
;; PREFIX is appended to emerge-temp-file-prefix to make the filename prefix.
(defun emerge-make-temp-file (prefix)
- (let ((f (make-temp-file (concat emerge-temp-file-prefix prefix))))
- (set-file-modes f emerge-temp-file-mode)
+ (let (f (old-modes (default-file-modes)))
+ (unwind-protect
+ (progn
+ (set-default-file-modes emerge-temp-file-mode)
+ (setq f (make-temp-file (concat emerge-temp-file-prefix prefix))))
+ (set-default-file-modes old-modes))
f))
;;; Functions that query the user before he can write out the current buffer.