(ebrowse-tree-mode-map): Use display-mouse-p instead of window-system.

[gnu-emacs] / lisp / emerge.el

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.