[Emacs-diffs] trunk r117105: * lisp/vc/emerge.el (emerge-make-temp-file): Simplify.

[Glenn Morris]

------------------------------------------------------------
revno: 117105
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-05-14 10:05:16 -0700
message:
  * lisp/vc/emerge.el (emerge-make-temp-file): Simplify.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/vc/emerge.el              emerge.el-20091113204419-o5vbwnq5f7feedwu-464

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-05-14 17:01:29 +0000
+++ b/lisp/ChangeLog    2014-05-14 17:05:16 +0000
@@ -1,3 +1,7 @@
+2014-05-14  Glenn Morris  <address@hidden>
+
+       * vc/emerge.el (emerge-make-temp-file): Simplify.
+
 2014-05-14  Stephen Berman <address@hidden>
             Stefan Monnier  <address@hidden>
 

=== modified file 'lisp/vc/emerge.el'
--- a/lisp/vc/emerge.el 2014-05-14 06:59:12 +0000
+++ b/lisp/vc/emerge.el 2014-05-14 17:05:16 +0000
@@ -2883,17 +2883,11 @@
     (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.