summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-02-11 19:07:17 -0500
committerLuke Shumaker <lukeshu@lukeshu.com>2017-02-11 19:07:17 -0500
commit15452ba20c9d2cd652186c610ed3ada798b78e08 (patch)
tree914bc0343c1fa9d81ca27d34e72dee2db4134f7c
parent0c3fdcfa05aeaa47430d0aede456f32c9d741301 (diff)
emacs: play nice with ssh
-rw-r--r--.config/emacs/init.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index b7ee6df..be98b5f 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -179,6 +179,10 @@ sh-script.el is broken."
(if xterm-mouse-mode (xterm-mouse-mode 1))
)))
+;; Make TRAMP obey ~/.ssh/config for ControlMaster. For some reason,
+;; customize doesn't correctly set this.
+(setq tramp-use-ssh-controlmaster-options nil)
+
;; Use mailcrypt to encrypt/decrypt email
(when (require 'mailcrypt nil t)
(mc-setversion "gpg")