aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2018-04-03 09:51:01 +0200
committerMichael Albinus2018-04-03 09:51:01 +0200
commit56794ac6c7fb1ca1dd1fd8dfb0ac40e20901f2c0 (patch)
treeaadfb1b4a3af1436a406601b2c14fc0fece09498
parenta231c33eabed7d2eb132b8cb45142c3012783f54 (diff)
downloademacs-56794ac6c7fb1ca1dd1fd8dfb0ac40e20901f2c0.tar.gz
emacs-56794ac6c7fb1ca1dd1fd8dfb0ac40e20901f2c0.zip
Fix Bug#31022
* lisp/cus-start.el (temporary-file-directory): Suppress file name handlers when calling `shell-command-to-string'. (Bug#31022)
-rw-r--r--lisp/cus-start.el7
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index dace6f79549..451e7f762f4 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -277,9 +277,10 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
277 ((eq system-type 'darwin) 277 ((eq system-type 'darwin)
278 (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP") 278 (or (getenv "TMPDIR") (getenv "TMP") (getenv "TEMP")
279 ;; See bug#7135. 279 ;; See bug#7135.
280 (let ((tmp (ignore-errors 280 (let* (file-name-handler-alist
281 (shell-command-to-string 281 (tmp (ignore-errors
282 "getconf DARWIN_USER_TEMP_DIR")))) 282 (shell-command-to-string
283 "getconf DARWIN_USER_TEMP_DIR"))))
283 (and (stringp tmp) 284 (and (stringp tmp)
284 (setq tmp (replace-regexp-in-string 285 (setq tmp (replace-regexp-in-string
285 "\n\\'" "" tmp)) 286 "\n\\'" "" tmp))