summaryrefslogtreecommitdiff
path: root/lisp/ediff-init.el
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-05-16 03:41:42 +0000
committerRichard M. Stallman <rms@gnu.org>1998-05-16 03:41:42 +0000
commit4a37a5df9e59b2d5d0b35449d02159cfdd4e59cb (patch)
tree5279dc72be943aec7415c2038514b4c85ea37e10 /lisp/ediff-init.el
parentff432440bc3401eed5822cc3ed7802eddae4fa5b (diff)
downloademacs-4a37a5df9e59b2d5d0b35449d02159cfdd4e59cb.tar.gz
(ediff-temp-file-prefix): Use system-tmp-directory.
Diffstat (limited to 'lisp/ediff-init.el')
-rw-r--r--lisp/ediff-init.el16
1 files changed, 3 insertions, 13 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index d5ac60b2a81..f56a1922588 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1204,19 +1204,9 @@ Instead, C-h would jump to previous difference."
:group 'ediff)
(defcustom ediff-temp-file-prefix
- (let ((env (or (getenv "TMPDIR")
- (getenv "TMP")
- (getenv "TEMP")))
- d)
- (setq d (if (and env (> (length env) 0))
- env
- (cond ((memq system-type '(vax-vms axp-vms)) "SYS$SCRATCH:")
- ((eq system-type 'ms-dos) "c:/")
- (t "/tmp"))))
- ;; The following is to make sure we get something to which we can
- ;; add directory levels under VMS.
- (setq d (file-name-as-directory (directory-file-name d)))
- )
+ ;; The following is to make sure we get something to which we can
+ ;; add directory levels under VMS.
+ (file-name-as-directory system-tmp-directory)
"*Prefix to put on Ediff temporary file names.
Do not start with `~/' or `~user-name/'."
:type 'string