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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77e8942bdccc350d1498778b39a0a9702069fffa..9fa46937f770986b74f78e8ba32e965e7587c05c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+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>
 

diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index d4638616dd746580576c936206e9438cdf53885f..b17d11d34a43fd2f589a32fc48c8ebd595c4a3c1 100644 (file)
--- 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.