summaryrefslogtreecommitdiff
path: root/lisp/ediff-init.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>1999-09-02 12:33:53 +0000
committerEli Zaretskii <eliz@gnu.org>1999-09-02 12:33:53 +0000
commit659cb92874e24a7e8b187e5df8957349fc38022f (patch)
tree144eea4b801953df75d0e61d835f5f58ad329b82 /lisp/ediff-init.el
parent607f86f52769c8a965b77bdc0f85be4af6ed6fee (diff)
downloademacs-659cb92874e24a7e8b187e5df8957349fc38022f.tar.gz
(ediff-temp-file-prefix): Use
small-temporary-file-directory if non-nil.
Diffstat (limited to 'lisp/ediff-init.el')
-rw-r--r--lisp/ediff-init.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index fc91c7bbea2..1126d589da6 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1205,7 +1205,8 @@ Instead, C-h would jump to previous difference."
:group 'ediff)
(defcustom ediff-temp-file-prefix
- (file-name-as-directory temporary-file-directory)
+ (file-name-as-directory
+ (or small-temporary-file-directory temporary-file-directory))
"*Prefix to put on Ediff temporary file names.
Do not start with `~/' or `~USERNAME/'."
:type 'string