diff options
author | Tom Willemsen | 2011-04-21 10:08:38 +0200 |
---|---|---|
committer | Tom Willemsen | 2011-04-21 10:08:38 +0200 |
commit | 6c769687be114f1e501a42b426013a46ebfcd983 (patch) | |
tree | ca7d477e9599c793a12e3faf16c86d1ab2923f49 | |
parent | e58f826ef29263bdf4ef8184f88edc54a16fa53f (diff) | |
parent | e0717aee275200b8fab0b75a5417468158b6e318 (diff) | |
download | dotfiles-6c769687be114f1e501a42b426013a46ebfcd983.tar.gz dotfiles-6c769687be114f1e501a42b426013a46ebfcd983.zip |
Merge branch 'master' of git://gitorious.org/ryuslash/dotfiles
-rw-r--r-- | emacs | 4 | ||||
-rw-r--r-- | emacs.d/00-paths.el | 3 | ||||
-rw-r--r-- | emacs.d/20-c-eldoc.el | 3 | ||||
-rw-r--r-- | emacs.d/20-git-commit.el | 1 |
4 files changed, 7 insertions, 4 deletions
@@ -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 |