Commit a5d09243 authored by Glenn Morris's avatar Glenn Morris

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.
parent e95b937a
2014-05-14 Glenn Morris <rgm@gnu.org>
* 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 <michael.albinus@gmx.de> 2014-05-13 Michael Albinus <michael.albinus@gmx.de>
* net/browse-url.el (browse-url): * net/browse-url.el (browse-url):
......
...@@ -261,11 +261,19 @@ Do not start with `~/' or `~USERNAME/'." ...@@ -261,11 +261,19 @@ Do not start with `~/' or `~USERNAME/'."
:type 'string :type 'string
:group 'emerge) :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 (defcustom emerge-temp-file-mode 384 ; u=rw only
"Mode for Emerge temporary files." "Mode for Emerge temporary files."
:type 'integer :type 'integer
:group 'emerge) :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 (defcustom emerge-combine-versions-template
"#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n" "#ifdef NEW\n%b#else /* not NEW */\n%a#endif /* not NEW */\n"
"Template for `emerge-combine-versions' to combine the two versions. "Template for `emerge-combine-versions' to combine the two versions.
...@@ -2881,6 +2889,7 @@ keymap. Leaves merge in fast mode." ...@@ -2881,6 +2889,7 @@ keymap. Leaves merge in fast mode."
(let (f (old-modes (default-file-modes))) (let (f (old-modes (default-file-modes)))
(unwind-protect (unwind-protect
(progn (progn
;; This has no effect, since make-temp-file sets umask = 700.
(set-default-file-modes emerge-temp-file-mode) (set-default-file-modes emerge-temp-file-mode)
(setq f (make-temp-file (concat emerge-temp-file-prefix prefix)))) (setq f (make-temp-file (concat emerge-temp-file-prefix prefix))))
(set-default-file-modes old-modes)) (set-default-file-modes old-modes))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment