[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101697: Tweak temporary-file-directo
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101697: Tweak temporary-file-directory on darwin systems. |
Date: |
Thu, 30 Sep 2010 20:57:26 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101697
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-09-30 20:57:26 -0700
message:
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).
modified:
lisp/ChangeLog
lisp/files.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-01 01:28:45 +0000
+++ b/lisp/ChangeLog 2010-10-01 03:57:26 +0000
@@ -1,3 +1,8 @@
+2010-10-01 Glenn Morris <address@hidden>
+
+ * files.el (temporary-file-directory): On darwin, also try
+ DARWIN_USER_TEMP_DIR (see discussion in bug#7135).
+
2010-10-01 Juanma Barranquero <address@hidden>
* server.el (server-start): Revert part of revno 101688.
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2010-09-25 20:16:35 +0000
+++ b/lisp/files.el 2010-10-01 03:57:26 +0000
@@ -190,12 +190,27 @@
(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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101697: Tweak temporary-file-directory on darwin systems.,
Glenn Morris <=