summaryrefslogtreecommitdiffstats
path: root/emacs.el
diff options
context:
space:
mode:
Diffstat (limited to 'emacs.el')
-rw-r--r--emacs.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/emacs.el b/emacs.el
index 06ab322..f139a88 100644
--- a/emacs.el
+++ b/emacs.el
@@ -3,7 +3,6 @@
;; LOAD-PATHS ;;
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(add-to-list 'load-path "~/.emacs.d/elisp")
-(add-to-list 'load-path "~/.emacs.d/naquadah-theme")
(add-to-list 'load-path "~/.emacs.d/elisp/markdown-mode")
(add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode")
(add-to-list 'load-path "~/.emacs.d/elisp/lua-mode")
@@ -14,13 +13,13 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(require 'autopair)
(require 'column-marker)
-(require 'git-commit)
(require 'org-crypt)
(require 'rainbow-delimiters)
(require 'uniquify)
(require 'server)
(require 'org-publish)
(require 'htmlize)
+(require 'git)
(load-file "~/.emacs.d/functions.el")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -42,6 +41,7 @@
(autoload 'go-mode "go-mode" "Major mode for google go" t)
(autoload 'gofmt "go-mode" "" t)
(autoload 'go-fmt-before-save "go-mode" "" t)
+(autoload 'git-commit-mode "git-commit" "" t)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; VARIABLES ;;
@@ -155,6 +155,7 @@
(add-to-list 'auto-mode-alist '("\\.go$" . go-mode))
(add-to-list 'auto-mode-alist '("\\.commitmsg$" . org-mode))
(add-to-list 'auto-mode-alist '(".*mutt.*" . message-mode))
+(add-to-list 'auto-mode-alist '("COMMIT_EDITMSG$" . git-commit-mode))
(add-to-list 'file-coding-system-alist '("\\.vala$" . utf-8))
(add-to-list 'file-coding-system-alist '("\\.vapi$" . utf-8))