EMACS: Don't load functions.el, just functions; Use html-mode for *.tpl

This commit is contained in:
Tom Willemsen 2011-08-20 12:10:12 +02:00
parent f68cfe9bc7
commit 654a21f920

View file

@ -1,6 +1,6 @@
;; -*- mode: Emacs-Lisp; -*- ;; -*- mode: Emacs-Lisp; -*-
(load "~/.emacs.d/ryuslash-load-path") (load "~/.emacs.d/ryuslash-load-path")
(load-file "~/.emacs.d/functions.el") (load "~/.emacs.d/functions")
;;; Autopair ;;; Autopair
(require 'autopair) (require 'autopair)
@ -231,6 +231,7 @@
(add-to-list 'auto-mode-alist '("\\.css$" . css-mode)) (add-to-list 'auto-mode-alist '("\\.css$" . css-mode))
(add-to-list 'auto-mode-alist '("stumpwmrc" . stumpwm-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 '("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 '("\\.vala$" . utf-8))
(add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8)) (add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8))