Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se

1 files changed, 9 insertions, 0 deletions

diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index 0cf4484aac1..d4638616dd7 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -261,11 +261,19 @@ Do not start with `~/' or `~USERNAME/'."
   :type 'string
   :group 'emerge)
 
+(make-obsolete-variable 'emerge-temp-file-prefix
+                        "customize `temporary-file-directory' instead."
+                        "24.4" 'set)
+
 (defcustom emerge-temp-file-mode 384    ; u=rw only
   "Mode for Emerge temporary files."
   :type 'integer
   :group 'emerge)
 
+(make-obsolete-variable 'emerge-temp-file-mode
+                        "it has no effect, temporary files are always private."
+                        "24.4" 'set)
+
 (defcustom emerge-combine-versions-template
   "#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n"
   "Template for `emerge-combine-versions' to combine the two versions.
@@ -2881,6 +2889,7 @@ keymap.  Leaves merge in fast mode."
   (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))