From 58c0c710ea6f2184f53f3b1849f0691e23b79d22 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 22 Dec 2016 16:24:31 +0000
Subject: Emacs: Use ssh-managed controlmaster options

---
 tag-emacs/emacs.d/init.org | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tag-emacs')

diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 96a94b8a..e12cd6f7 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -653,6 +653,7 @@ that I can sudo on remote machines
                   tramp-default-user-alist '(("\\`su\\(do\\)?\\'" nil "root"))
                   tramp-backup-directory-alist backup-directory-alist
                   tramp-completion-reread-directory-timeout 60
+                  tramp-ssh-controlmaster-options nil
                   backup-enable-predicate (lambda (name)
                                             (and (normal-backup-enable-predicate name)
                                                  (not (let ((method (file-remote-p name 'method)))
-- 
cgit 1.4.1