diff options
| author | Glenn Morris <rgm@gnu.org> | 2010-10-28 23:51:36 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2010-10-28 23:51:36 -0700 |
| commit | e088c02a81d502ef52cb494d6b73238b94861e3a (patch) | |
| tree | aaa7a716b660ea4b7d97919b8b8babd83ff45a76 /lisp/files.el | |
| parent | 9d7940260552d9ad5f331443aae200094ae2847c (diff) | |
| download | emacs-e088c02a81d502ef52cb494d6b73238b94861e3a.tar.gz | |
Remove duplicate Lisp definition of temporary-file-directory, from filelock.c.
* lisp/files.el (temporary-file-directory): Remove (already defined in C).
* lisp/cus-start.el: Add temporary-file-directory.
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/lisp/files.el b/lisp/files.el index d5f60b7817d..0c5640d13a4 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -188,32 +188,6 @@ If the buffer is visiting a new file, the value is nil.") "Non-nil if visited file was read-only when visited.") (make-variable-buffer-local 'buffer-file-read-only) -(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) - (defcustom small-temporary-file-directory (if (eq system-type 'ms-dos) (getenv "TMPDIR")) "The directory for writing small temporary files. @@ -6470,5 +6444,4 @@ Otherwise, trash FILENAME using the freedesktop.org conventions, (define-key ctl-x-5-map "r" 'find-file-read-only-other-frame) (define-key ctl-x-5-map "\C-o" 'display-buffer-other-frame) -;; arch-tag: bc68d3ea-19ca-468b-aac6-3a4a7766101f ;;; files.el ends here |