summaryrefslogtreecommitdiff
path: root/lisp/net/tramp-integration.el
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2019-03-23 09:55:04 +0100
committerMichael Albinus <michael.albinus@gmx.de>2019-03-23 09:55:04 +0100
commita3194e7b7654134a51bc066dbf91cf59c3ce393d (patch)
treed8dba7e07759168304f85f031b63429c9ce06c39 /lisp/net/tramp-integration.el
parent86c3cd99bff27e35e25dec0ee3f0dc4536b171ea (diff)
downloademacs-a3194e7b7654134a51bc066dbf91cf59c3ce393d.tar.gz
Fix Bug#34943
* lisp/files-x.el (cl-lib): Require when compiling. (hack-connection-local-variables): Regard connection-local variables as safe. (Bug#34943) * lisp/shell.el (shell): Use `with-connection-local-variables' for the whole code block. (Bug#34943) * lisp/net/tramp-adb.el (tramp-connection-local-safe-shell-file-names): Do not set values. * lisp/net/tramp-integration.el (tramp-connection-local-safe-shell-file-names): Remove. (shell-file-name, shell-command-switch): Do not add safe-local-variable property. * lisp/net/tramp.el (tramp-handle-shell-command): Use proper buffer name. * test/lisp/net/tramp-tests.el (tramp-test34-explicit-shell-file-name): Tag it :unstable.
Diffstat (limited to 'lisp/net/tramp-integration.el')
-rw-r--r--lisp/net/tramp-integration.el11
1 files changed, 0 insertions, 11 deletions
diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el
index 946d7f8cbab..da168adce77 100644
--- a/lisp/net/tramp-integration.el
+++ b/lisp/net/tramp-integration.el
@@ -173,21 +173,10 @@ NAME must be equal to `tramp-current-connection'."
;;; Default connection-local variables for Tramp:
-;;;###tramp-autoload
-(defvar tramp-connection-local-safe-shell-file-names nil
- "List of safe `shell-file-name' values for remote hosts.")
-(add-to-list 'tramp-connection-local-safe-shell-file-names "/bin/sh")
-
(defconst tramp-connection-local-default-profile
'((shell-file-name . "/bin/sh")
(shell-command-switch . "-c"))
"Default connection-local variables for remote connections.")
-(put 'shell-file-name 'safe-local-variable
- (lambda (item)
- (and (stringp item)
- (member item tramp-connection-local-safe-shell-file-names))))
-(put 'shell-command-switch 'safe-local-variable
- (lambda (item) (and (stringp item) (string-equal item "-c"))))
;; `connection-local-set-profile-variables' and
;; `connection-local-set-profiles' exists since Emacs 26.1.