[Emacs-diffs] emacs-24 r117112: Make some pointless/useless emerge.el options obsolete

[Glenn Morris]

------------------------------------------------------------
revno: 117112
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-05-13 23:59:12 -0700
message:
  Make some pointless/useless emerge.el options obsolete
  
  * vc/emerge.el (emerge-temp-file-prefix): Make pointless option obsolete.
  (emerge-temp-file-mode): Make non-functional option obsolete.
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-13 08:54:08 +0000
+++ b/lisp/ChangeLog    2014-05-14 06:59:12 +0000
@@ -1,3 +1,9 @@
+2014-05-14  Glenn Morris  <address@hidden>
+
+       * vc/emerge.el (emerge-temp-file-prefix):
+       Make pointless option obsolete.
+       (emerge-temp-file-mode): Make non-functional option obsolete.
+
 2014-05-13  Michael Albinus  <address@hidden>
 
        * net/browse-url.el (browse-url):

=== modified file 'lisp/vc/emerge.el'
--- a/lisp/vc/emerge.el 2014-02-03 00:40:49 +0000
+++ b/lisp/vc/emerge.el 2014-05-14 06:59:12 +0000
@@ -261,11 +261,19 @@
   :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 @@
   (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))