summaryrefslogtreecommitdiffstats
path: root/.emacs.d
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2013-01-28 00:18:29 +0100
committerGravatar Tom Willemsen2013-01-28 00:18:29 +0100
commit5a1e9f2ea8ec2b7e625539ee2bd4006dce269eb2 (patch)
tree051ea35afdac33ace6086fb2f5956f269df5246c /.emacs.d
parent35fc2e3378a3b91547b43b2d0fef28f8d88c1e37 (diff)
downloaddotfiles-5a1e9f2ea8ec2b7e625539ee2bd4006dce269eb2.tar.gz
dotfiles-5a1e9f2ea8ec2b7e625539ee2bd4006dce269eb2.zip
Move eldoc settings to org
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/init.el1
-rw-r--r--.emacs.d/init.org8
2 files changed, 8 insertions, 1 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index dddef30..ac10520 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -23,7 +23,6 @@
"Face for the supposedly empty line in commit messages."
:group 'local)
-(eval-after-load "eldoc" '(diminish 'eldoc-mode))
(eval-after-load "em-term" '(add-to-list 'eshell-visual-commands "unison"))
(eval-after-load "emms-source-file" '(oni:emms-init))
(eval-after-load "flymake" '(oni:flymake-init))
diff --git a/.emacs.d/init.org b/.emacs.d/init.org
index ac7f7c1..d46e722 100644
--- a/.emacs.d/init.org
+++ b/.emacs.d/init.org
@@ -74,3 +74,11 @@
#+BEGIN_SRC emacs-lisp :tangle init2.el
(defalias 'dabbrev-expand 'hippie-expand)
#+END_SRC
+
+ Don't show it when ~eldoc~ is running, I almost assume that it is
+ whenever I'm working in a mode that supports it anyway. This should
+ only execute once ~eldoc~ has been loaded.
+
+ #+BEGIN_SRC emacs-lisp :tangle init2.el
+ (eval-after-load "eldoc" '(diminish 'eldoc-mode))
+ #+END_SRC