Merge branch 'master' of github.com:TychoBrahe/dotfiles

This commit is contained in:
Rodolphe Breard 2013-06-26 15:13:59 +02:00
commit dc7151b6a9

View file

@ -20,6 +20,7 @@
;; JSON ;; JSON
(setq auto-mode-alist (cons '("\.json$" . js-mode) auto-mode-alist)) (setq auto-mode-alist (cons '("\.json$" . js-mode) auto-mode-alist))
(setq auto-mode-alist (cons '("\.geojson$" . js-mode) auto-mode-alist))
;; HTML ;; HTML
(setq auto-mode-alist (cons '("\.template$" . html-mode) auto-mode-alist)) (setq auto-mode-alist (cons '("\.template$" . html-mode) auto-mode-alist))