Commit abad7b05 authored by Glenn Morris's avatar Glenn Morris
Browse files

* lisp/vc/emerge.el (emerge-make-temp-file): Simplify.

parent f4da4720
2014-05-14 Glenn Morris <rgm@gnu.org>
* vc/emerge.el (emerge-make-temp-file): Simplify.
2014-05-14 Stephen Berman <stephen.berman@gmx.net>
Stefan Monnier <monnier@iro.umontreal.ca>
 
......
......@@ -2883,17 +2883,11 @@ keymap. Leaves merge in fast mode."
(setq vars (cdr vars))
(setq values (cdr values))))
;; Make a temporary file that only we have access to.
;; PREFIX is appended to emerge-temp-file-prefix to make the filename prefix.
;; When the pointless option emerge-temp-file-prefix goes,
;; make this function obsolete too, and just use make-temp-file.
(defun emerge-make-temp-file (prefix)
(let (f (old-modes (default-file-modes)))
(unwind-protect
(progn
;; This has no effect, since make-temp-file sets umask = 700.
(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))
"Make a private temporary file based on `emerge-temp-file-prefix'."
(make-temp-file (concat emerge-temp-file-prefix prefix)))
;;; Functions that query the user before he can write out the current buffer.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment