Merge branch 'master' of git://gitorious.org/ryuslash/dotfiles

4 files changed, 7 insertions, 4 deletions

diff --git a/emacs b/emacs
index 0d4c1ab..1a24abf 100644
--- a/emacs
+++ b/emacs
@@ -1,4 +1,8 @@
 ;; -*- mode: Emacs-Lisp; -*-
+(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")
 
 (setq d-dir "~/.emacs.d/")
 (setq elisp-dir (concat d-dir "elisp/"))
diff --git a/emacs.d/00-paths.el b/emacs.d/00-paths.el
deleted file mode 100644
index c9853c2..0000000
--- a/emacs.d/00-paths.el
+++ /dev/null
@@ -1,3 +0,0 @@
-(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")
diff --git a/emacs.d/20-c-eldoc.el b/emacs.d/20-c-eldoc.el
index 6269936..5f01f6b 100644
--- a/emacs.d/20-c-eldoc.el
+++ b/emacs.d/20-c-eldoc.el
@@ -1,3 +1,6 @@
 (setq c-eldoc-includes "`pkg-config x11 --cflags` -I./ -I../")
 (load "c-eldoc")
 (add-hook 'c-mode-hook 'c-turn-on-eldoc-mode)
+(add-hook 'php-mode-hook
+          (lambda ()
+            (eldoc-mode -1)))
diff --git a/emacs.d/20-git-commit.el b/emacs.d/20-git-commit.el
index 4568af0..2b717e8 100644
--- a/emacs.d/20-git-commit.el
+++ b/emacs.d/20-git-commit.el
@@ -1,4 +1,3 @@
-(add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode")
 (require 'git-commit)
 
 (add-hook 'git-commit-mode-hook