about summary refs log tree commit diff
path: root/emacs/.emacs.d
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-09-08T12·12+0100
committerWilliam Carroll <wpcarro@gmail.com>2020-09-08T12·12+0100
commit34af54eb0447cbb27eb6b17a276a263d028eccfb (patch)
treecd9fdade1c6ca2b417e79a3a96e9394642787f52 /emacs/.emacs.d
parent74f1359924d3d03a89392b837d5089351913cedc (diff)
Prefer .ssh/config instead of Tramp's defaults
Instruct Tramp to use my SSH settings in .ssh/config.
Diffstat (limited to 'emacs/.emacs.d')
-rw-r--r--emacs/.emacs.d/wpc/ssh.el5
1 files changed, 5 insertions, 0 deletions
diff --git a/emacs/.emacs.d/wpc/ssh.el b/emacs/.emacs.d/wpc/ssh.el
index a642e6fa3e57..2e5839c04698 100644
--- a/emacs/.emacs.d/wpc/ssh.el
+++ b/emacs/.emacs.d/wpc/ssh.el
@@ -37,6 +37,11 @@
 ;; Maximizes the tramp debugging noisiness while I'm still learning about tramp.
 (setq tramp-verbose 10)
 
+;; As confusing as this may seem, this forces Tramp to use *my* .ssh/config
+;; options, which enable ControlMaster. In other words, disabling this actually
+;; enables ControlMaster.
+(setq tramp-use-ssh-controlmaster-options nil)
+
 (defcustom ssh-hosts '("desktop" "socrates")
   "List of hosts to which I commonly connect.
 Note: It could be interesting to read these values from ~/.ssh-config, but