mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-06 23:51:24 -08:00
Code Issues Projects Releases Wiki Activity

Tweak temporary-file-directory on darwin systems.

Browse source 
* lisp/files.el (temporary-file-directory): On darwin, also try
DARWIN_USER_TEMP_DIR (see discussion in bug#7135).
This commit is contained in:
Glenn Morris 2010-09-30 20:57:26 -07:00
parent a16f5f64c7
commit 1ef075bb27
2 changed files with 20 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2010-10-01 Glenn Morris <rgm@gnu.org>
* files.el (temporary-file-directory): On darwin, also try
DARWIN_USER_TEMP_DIR (see discussion in bug#7135).
2010-10-01 Juanma Barranquero <lekktu@gmail.com>
* server.el (server-start): Revert part of 2010-09-30T02:53:26Z!lekktu@gmail.com.

15
lisp/files.el
View file

@ -190,12 +190,27 @@ If the buffer is visiting a new file, the value is nil.")
(defcustom temporary-file-directory
(file-name-as-directory
;; FIXME ? Should there be Ftemporary_file_directory to do the
;; following more robustly (cf set_local_socket in emacsclient.c).
;; It could be used elsewhere, eg Fcall_process_region, server-socket-dir.
;; See bug#7135.
(cond ((memq system-type '(ms-dos windows-nt))
(or (getenv "TEMP") (getenv "TMPDIR") (getenv "TMP") "c:/temp"))
((eq system-type 'darwin)
(or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP")
(let ((tmp (ignore-errors (shell-command-to-string ; bug#7135
"getconf DARWIN_USER_TEMP_DIR"))))
(and (stringp tmp)
(setq tmp (replace-regexp-in-string "\n\\'" "" tmp))
;; This handles "getconf: Unrecognized variable..."
(file-directory-p tmp)
tmp))
"/tmp"))
(t
(or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") "/tmp"))))
"The directory for writing temporary files."
:group 'files
;; Darwin section added 24.1, does not seem worth :version bump.
:initialize 'custom-initialize-delay
:type 'directory)