summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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")