summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2015-05-24 17:56:46 +0900
committerSean Whitton <spwhitton@spwhitton.name>2015-05-24 17:56:46 +0900
commita71cd84b72d0e28a901b140a2deabff82d5ab43a (patch)
tree2912694748f5f667b520a73bf6561af6aca4f50a
parent14dd0ea9e47f31563f4b4deebb2596ddad9c5054 (diff)
downloaddotfiles-a71cd84b72d0e28a901b140a2deabff82d5ab43a.tar.gz
workaround use-package 2.0 odd behaviour
:config seems to get called for every single Org file opened when generating the agenda, and diminishing org-indent-mode no longer works
-rw-r--r--.emacs.d/init-org.el5
-rw-r--r--.emacs.d/init.el6
2 files changed, 8 insertions, 3 deletions
diff --git a/.emacs.d/init-org.el b/.emacs.d/init-org.el
index f3065154..df50f78e 100644
--- a/.emacs.d/init-org.el
+++ b/.emacs.d/init-org.el
@@ -61,6 +61,11 @@
;;;; ---- preferences ----
+;; diminish `org-indent-mode' lighter
+
+(require 'diminish)
+(diminish 'org-indent-mode)
+
;; custom doesn't actually set all the faces it should, so we'll do
;; some manually
;;(set-face-foreground 'org-hide "#3f3f3f")
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index c2a570f9..59ecb5d1 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -313,6 +313,8 @@
;;; Org
+(eval-after-load 'org (load "~/.emacs.d/init-org.el"))
+
(use-package org
:ensure org-plus-contrib
:pin org
@@ -322,9 +324,7 @@
org-store-link
org-agenda
spw/org-agenda-file-to-front
- spw/org-remove-file)
- :diminish org-indent-mode
- :config (load "~/.emacs.d/init-org.el"))
+ spw/org-remove-file))
;;; keep pop up windows under control