summaryrefslogtreecommitdiffstats
path: root/.emacs.d
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2011-08-20 12:10:12 +0200
committerGravatar Tom Willemsen2011-08-20 12:10:12 +0200
commit654a21f920f854ff8eaaaaee69c0b0a2261ac0af (patch)
tree744daf98c9e193b061d92696086ac58dfd2ef90a /.emacs.d
parentf68cfe9bc75f76d955957a12934f490b72f9f631 (diff)
downloaddotfiles-654a21f920f854ff8eaaaaee69c0b0a2261ac0af.tar.gz
dotfiles-654a21f920f854ff8eaaaaee69c0b0a2261ac0af.zip
EMACS: Don't load functions.el, just functions; Use html-mode for *.tpl
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/init.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 8470ce4..a58aa80 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,6 +1,6 @@
;; -*- mode: Emacs-Lisp; -*-
(load "~/.emacs.d/ryuslash-load-path")
-(load-file "~/.emacs.d/functions.el")
+(load "~/.emacs.d/functions")
;;; Autopair
(require 'autopair)
@@ -231,6 +231,7 @@
(add-to-list 'auto-mode-alist '("\\.css$" . css-mode))
(add-to-list 'auto-mode-alist '("stumpwmrc" . stumpwm-mode))
(add-to-list 'auto-mode-alist '("COMMIT_EDITMSG$" . git-commit-mode))
+(add-to-list 'auto-mode-alist '("\\.tpl$" . html-mode))
(add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8))
(add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8))