lang/org: refactor & disable evil-org-set-key-theme

+ It's too much trouble supporting the evil-org-set-key-theme workflow.
  Perhaps I'll make it complain when you do.
+ Don't add +org|setup-ui to doom-load-theme-hook, it's unnecsesary.
+ Use faces in org-priority-faces rather than colors.
This commit is contained in:
Henrik Lissner 2018-06-27 02:53:18 +02:00
parent f915f8c864
commit 75457f63fe
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -29,8 +29,8 @@
(add-hook 'org-load-hook #'+org|setup-evil) (add-hook 'org-load-hook #'+org|setup-evil)
(add-hook 'evil-org-mode-hook #'evil-normalize-keymaps) (add-hook 'evil-org-mode-hook #'evil-normalize-keymaps)
:config :config
;; in case it is called later ;; only support the `evil-org-key-theme' workflow
(advice-add #'evil-org-set-key-theme :after #'+org|setup-evil) (advice-add #'evil-org-set-key-theme :override #'ignore)
(def-package! evil-org-agenda (def-package! evil-org-agenda
:after org-agenda :after org-agenda
:config (evil-org-agenda-set-keys))) :config (evil-org-agenda-set-keys)))
@ -174,9 +174,9 @@ unfold to point on startup."
org-pretty-entities nil org-pretty-entities nil
org-pretty-entities-include-sub-superscripts t org-pretty-entities-include-sub-superscripts t
org-priority-faces org-priority-faces
`((?a . ,(face-foreground 'error)) '((?a . error)
(?b . ,(face-foreground 'warning)) (?b . warning)
(?c . ,(face-foreground 'success))) (?c . success))
org-startup-folded t org-startup-folded t
org-startup-indented t org-startup-indented t
org-startup-with-inline-images nil org-startup-with-inline-images nil
@ -241,10 +241,7 @@ unfold to point on startup."
(def-org-file-link! "org" org-directory) (def-org-file-link! "org" org-directory)
(def-org-file-link! "doom" doom-emacs-dir) (def-org-file-link! "doom" doom-emacs-dir)
(def-org-file-link! "doom-docs" doom-docs-dir) (def-org-file-link! "doom-docs" doom-docs-dir)
(def-org-file-link! "doom-modules" doom-modules-dir) (def-org-file-link! "doom-modules" doom-modules-dir))
;; Update UI when theme is changed
(add-hook 'doom-load-theme-hook #'+org|setup-ui))
(defun +org|setup-keybinds () (defun +org|setup-keybinds ()
"Sets up org-mode and evil keybindings. Tries to fix the idiosyncrasies "Sets up org-mode and evil keybindings. Tries to fix the idiosyncrasies