(emerge-make-temp-file): Make sure file has proper

permissions from birth.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1955414dda123058489d0c8db1b213675d37948c..8dc9b5061196760d1c12fcb51b7a368018a51f07 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-23  Gerd Moellmann  <gerd@gnu.org>
 
+       * comint.el (comint-substitute-in-file-name): Call replace-match
+       with second and third arg t.
+
        * cus-edit.el (custom-button-face, custom-button-pressed-face): 
        Specify foreground color.
 
@@ -23,6 +26,11 @@
 
        * pcomplete.el: New file.
 
+2000-06-23  Paul Eggert  <eggert@twinsun.com>
+
+       * emerge.el (emerge-make-temp-file): Make sure file has proper
+       permissions from birth.
+
 2000-06-22  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * files.el (make-backup-file-name-1): On DOS/Windows, run the

diff --git a/lisp/emerge.el b/lisp/emerge.el
index b876c1c1192d65f9424b855f7bc036cbeba5f926..332c8b4699521c550e756930435f253ab7f0fe21 100644 (file)
--- 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.