diff options
| author | Michael Albinus | 2022-04-06 09:51:09 +0200 |
|---|---|---|
| committer | Michael Albinus | 2022-04-06 09:51:09 +0200 |
| commit | fbf6b7d2f0fb73379995e869d56df036e3e8b343 (patch) | |
| tree | 644df5ba30e7ecd0da82dc7521c45b088a8c0a00 | |
| parent | 069e0ba9f3aa21c29a6b3a35f63a440c3ca9c8ab (diff) | |
| download | emacs-fbf6b7d2f0fb73379995e869d56df036e3e8b343.tar.gz emacs-fbf6b7d2f0fb73379995e869d56df036e3e8b343.zip | |
Revert unneeded change in tramp-integration.el
* lisp/net/tramp-integration.el:
Apply `connection-local-set-profiles' w/o retrieving old values.
| -rw-r--r-- | lisp/net/tramp-integration.el | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el index 089093a4208..6be06d0e738 100644 --- a/lisp/net/tramp-integration.el +++ b/lisp/net/tramp-integration.el | |||
| @@ -286,11 +286,9 @@ NAME must be equal to `tramp-current-connection'." | |||
| 286 | 'tramp-connection-local-default-system-profile | 286 | 'tramp-connection-local-default-system-profile |
| 287 | tramp-connection-local-default-system-variables) | 287 | tramp-connection-local-default-system-variables) |
| 288 | 288 | ||
| 289 | (apply | 289 | (connection-local-set-profiles |
| 290 | #'connection-local-set-profiles | ||
| 291 | '(:application tramp) | 290 | '(:application tramp) |
| 292 | (cons 'tramp-connection-local-default-system-profile | 291 | 'tramp-connection-local-default-system-profile) |
| 293 | (connection-local-get-profiles '(:application tramp)))) | ||
| 294 | 292 | ||
| 295 | (defconst tramp-connection-local-default-shell-variables | 293 | (defconst tramp-connection-local-default-shell-variables |
| 296 | '((shell-file-name . "/bin/sh") | 294 | '((shell-file-name . "/bin/sh") |
| @@ -302,11 +300,9 @@ NAME must be equal to `tramp-current-connection'." | |||
| 302 | tramp-connection-local-default-shell-variables) | 300 | tramp-connection-local-default-shell-variables) |
| 303 | 301 | ||
| 304 | (with-eval-after-load 'shell | 302 | (with-eval-after-load 'shell |
| 305 | (apply | 303 | (connection-local-set-profiles |
| 306 | #'connection-local-set-profiles | ||
| 307 | '(:application tramp) | 304 | '(:application tramp) |
| 308 | (cons 'tramp-connection-local-default-shell-profile | 305 | 'tramp-connection-local-default-shell-profile)) |
| 309 | (connection-local-get-profiles '(:application tramp))))) | ||
| 310 | 306 | ||
| 311 | ;; Tested with FreeBSD 12.2. | 307 | ;; Tested with FreeBSD 12.2. |
| 312 | (defconst tramp-bsd-process-attributes-ps-args | 308 | (defconst tramp-bsd-process-attributes-ps-args |