From abad7b05fa544e5dfccf240180c37157dd92ac54 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 14 May 2014 10:05:16 -0700 Subject: [PATCH] * lisp/vc/emerge.el (emerge-make-temp-file): Simplify. --- lisp/ChangeLog | 4 ++++ lisp/vc/emerge.el | 14 ++++---------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77e8942bdc..9fa46937f7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-05-14 Glenn Morris + + * vc/emerge.el (emerge-make-temp-file): Simplify. + 2014-05-14 Stephen Berman Stefan Monnier diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index d4638616dd..b17d11d34a 100644 --- a/lisp/vc/emerge.el +++ b/lisp/vc/emerge.el @@ -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. -- 2.20.1