Tweak temporary-file-directory on darwin systems.

* lisp/files.el (temporary-file-directory): On darwin, also try
DARWIN_USER_TEMP_DIR (see discussion in bug#7135).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 901a5fb53a333777237866e7dca2417eabe9d49a..b1092c28cab14407927fa291b531eaf5c81c3bc6 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.

diff --git a/lisp/files.el b/lisp/files.el
index 40627f690f81d4fcbc05cea5781e1d2f7c3f0395..92574283dd7bb93d6316f0e34fcc170697eab2bc 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -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)