add markdown mode to the auto list

[emacs.git] / .emacs

diff --git a/.emacs b/.emacs
index 7aa6fca7f4da564d86560c643a233ef305bf8755..e863475b20b2b42400e8f1720504cbc6ac11e88d 100644 (file)
--- a/.emacs
+++ b/.emacs
@@ -90,9 +90,11 @@
 
 ; use markdown mode for mdwn files
 (add-to-list 'auto-mode-alist '("\\.mdwn$" . markdown-mode))
+(add-to-list 'auto-mode-alist '("\\.md$" . 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))