use ssh controlmaster options in config

diff --git a/.emacs b/.emacs
index 7aa6fca7f4da564d86560c643a233ef305bf8755..66f1b83dd819b47de50485c4e8635dba8fc83a76 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -92,7 +92,8 @@
 (add-to-list 'auto-mode-alist '("\\.mdwn$" . markdown-mode))
 
 
-
+;; tramp configuration
+(setq tramp-use-ssh-controlmaster-options nil)
 
 ; mail configuration
 (add-to-list 'auto-mode-alist '("muttng-[a-z0-9]+-[0-9]+-" . message-mode))