diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-05-13 23:59:12 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-05-13 23:59:12 -0700 |
| commit | a5d09243e7259152291f8a14b9528d7c177b6639 (patch) | |
| tree | b384dd32244ee257a1e46b2e2ad5dbde29ce2dc9 | |
| parent | e95b937a425af518f97837c5d9b41a8b2e8c0e58 (diff) | |
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.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc/emerge.el | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 803ef1f60b..da8f90d3b3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +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> * net/browse-url.el (browse-url): diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el index 0cf4484aac..d4638616dd 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)) |