From 654a21f920f854ff8eaaaaee69c0b0a2261ac0af Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Sat, 20 Aug 2011 12:10:12 +0200
Subject: EMACS: Don't load functions.el, just functions; Use html-mode for
 *.tpl

---
 .emacs.d/init.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to '.emacs.d/init.el')

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))
-- 
cgit v1.2.3-54-g00ecf