diff options
| author | Shuguang Sun <shuguang79@qq.com> | 2019-06-29 12:18:59 +0200 |
|---|---|---|
| committer | Michael Albinus <michael.albinus@gmx.de> | 2019-06-29 12:18:59 +0200 |
| commit | 67b50770c050c55a26cd13b9568b01a80a449885 (patch) | |
| tree | 51ce33f75a9e83583c51088b5b522f3e0261fd5a /lisp/net/tramp-integration.el | |
| parent | 497c120609e341d7e75a5a2b118a42b239c33489 (diff) | |
| download | emacs-67b50770c050c55a26cd13b9568b01a80a449885.tar.gz | |
Fix recent change in Tramp
* lisp/net/tramp-adb.el:
* lisp/net/tramp-archive.el:
* lisp/net/tramp-integration.el: Remove superfluous `progn' in
`with-eval-after-load'.
Diffstat (limited to 'lisp/net/tramp-integration.el')
| -rw-r--r-- | lisp/net/tramp-integration.el | 59 |
1 files changed, 28 insertions, 31 deletions
diff --git a/lisp/net/tramp-integration.el b/lisp/net/tramp-integration.el index 5960871ca7a..0c706da1ca1 100644 --- a/lisp/net/tramp-integration.el +++ b/lisp/net/tramp-integration.el @@ -124,17 +124,16 @@ been set up by `rfn-eshadow-setup-minibuffer'." #'identity (butlast (tramp-compat-exec-path)) path-separator))) (with-eval-after-load 'esh-util - (progn - (add-hook 'eshell-mode-hook - #'tramp-eshell-directory-change) - (add-hook 'eshell-directory-change-hook - #'tramp-eshell-directory-change) - (add-hook 'tramp-integration-unload-hook - (lambda () - (remove-hook 'eshell-mode-hook - #'tramp-eshell-directory-change) - (remove-hook 'eshell-directory-change-hook - #'tramp-eshell-directory-change))))) + (add-hook 'eshell-mode-hook + #'tramp-eshell-directory-change) + (add-hook 'eshell-directory-change-hook + #'tramp-eshell-directory-change) + (add-hook 'tramp-integration-unload-hook + (lambda () + (remove-hook 'eshell-mode-hook + #'tramp-eshell-directory-change) + (remove-hook 'eshell-directory-change-hook + #'tramp-eshell-directory-change)))) ;;; Integration of recentf.el: @@ -159,17 +158,16 @@ NAME must be equal to `tramp-current-connection'." (recentf-cleanup)))) (with-eval-after-load 'recentf - (progn - (add-hook 'tramp-cleanup-connection-hook - #'tramp-recentf-cleanup) - (add-hook 'tramp-cleanup-all-connections-hook - #'tramp-recentf-cleanup-all) - (add-hook 'tramp-integration-unload-hook - (lambda () - (remove-hook 'tramp-cleanup-connection-hook - #'tramp-recentf-cleanup) - (remove-hook 'tramp-cleanup-all-connections-hook - #'tramp-recentf-cleanup-all))))) + (add-hook 'tramp-cleanup-connection-hook + #'tramp-recentf-cleanup) + (add-hook 'tramp-cleanup-all-connections-hook + #'tramp-recentf-cleanup-all) + (add-hook 'tramp-integration-unload-hook + (lambda () + (remove-hook 'tramp-cleanup-connection-hook + #'tramp-recentf-cleanup) + (remove-hook 'tramp-cleanup-all-connections-hook + #'tramp-recentf-cleanup-all)))) ;;; Default connection-local variables for Tramp: @@ -181,15 +179,14 @@ NAME must be equal to `tramp-current-connection'." ;; `connection-local-set-profile-variables' and ;; `connection-local-set-profiles' exists since Emacs 26.1. (with-eval-after-load 'shell - (progn - (tramp-compat-funcall - 'connection-local-set-profile-variables - 'tramp-connection-local-default-profile - tramp-connection-local-default-profile) - (tramp-compat-funcall - 'connection-local-set-profiles - `(:application tramp) - 'tramp-connection-local-default-profile))) + (tramp-compat-funcall + 'connection-local-set-profile-variables + 'tramp-connection-local-default-profile + tramp-connection-local-default-profile) + (tramp-compat-funcall + 'connection-local-set-profiles + `(:application tramp) + 'tramp-connection-local-default-profile)) (add-hook 'tramp-unload-hook (lambda () (unload-feature 'tramp-integration 'force))) |