Merge remote-tracking branch 'upstream/master'

marivas · Feb 11, 2015 · 1a5adfb · 1a5adfb
2 parents 2a73383 + 2a38611
commit 1a5adfb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/prelude-packages.el b/core/prelude-packages.el
@@ -173,8 +173,8 @@ PACKAGE is installed only if not already present.  The file is opened in MODE."
 ;; markdown-mode doesn't have autoloads for the auto-mode-alist
 ;; so we add them manually if it's already installed
 (when (package-installed-p 'markdown-mode)
-  (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
-  (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode)))
+  (add-to-list 'auto-mode-alist '("\\.markdown\\'" . gfm-mode))
+  (add-to-list 'auto-mode-alist '("\\.md\\'" . gfm-mode)))
 
 (when (package-installed-p 'pkgbuild-mode)
   (add-to-list 'auto-mode-alist '("PKGBUILD\\'" . pkgbuild-mode)))