Merge branch 'master' of git://gitorious.org/ryuslash/dotfiles
This commit is contained in:
commit
6c769687be
4 changed files with 7 additions and 4 deletions
4
emacs
4
emacs
|
@ -1,4 +1,8 @@
|
||||||
;; -*- mode: Emacs-Lisp; -*-
|
;; -*- 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 d-dir "~/.emacs.d/")
|
||||||
(setq elisp-dir (concat d-dir "elisp/"))
|
(setq elisp-dir (concat d-dir "elisp/"))
|
||||||
|
|
|
@ -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")
|
|
|
@ -1,3 +1,6 @@
|
||||||
(setq c-eldoc-includes "`pkg-config x11 --cflags` -I./ -I../")
|
(setq c-eldoc-includes "`pkg-config x11 --cflags` -I./ -I../")
|
||||||
(load "c-eldoc")
|
(load "c-eldoc")
|
||||||
(add-hook 'c-mode-hook 'c-turn-on-eldoc-mode)
|
(add-hook 'c-mode-hook 'c-turn-on-eldoc-mode)
|
||||||
|
(add-hook 'php-mode-hook
|
||||||
|
(lambda ()
|
||||||
|
(eldoc-mode -1)))
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
(add-to-list 'load-path "~/.emacs.d/elisp/git-commit-mode")
|
|
||||||
(require 'git-commit)
|
(require 'git-commit)
|
||||||
|
|
||||||
(add-hook 'git-commit-mode-hook
|
(add-hook 'git-commit-mode-hook
|
||||||
|
|
Loading…
Reference in a new issue