From: Glenn Morris Date: Wed, 14 May 2014 06:59:12 +0000 (-0700) Subject: Make some pointless/useless emerge.el options obsolete X-Git-Tag: emacs-24.3.92~206 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5d09243e7259152291f8a14b9528d7c177b6639;p=emacs.git 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. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 803ef1f60b2..da8f90d3b3b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2014-05-14 Glenn Morris + + * 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 * net/browse-url.el (browse-url): 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))