emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

lang/org: use fork of evil-org

Browse source 
First step to fixing its issues.

Relevant to #1897, #1828
This commit is contained in:
Henrik Lissner 2019-10-23 17:36:30 -04:00
parent 009cfbcb90
commit fb28586795
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/lang/org/config.el
View file

@ -592,17 +592,11 @@ between the two."
(:when (featurep! +gnuplot) (:when (featurep! +gnuplot)
"p" #'org-plot/gnuplot))) "p" #'org-plot/gnuplot)))
;; HACK Fixes #1483: this messy hack fixes `org-agenda' or `evil-org-agenda' (map! :after org-agenda
;; overriding SPC, breaking the localleader :map org-agenda-mode-map
(define-minor-mode org-agenda-localleader-mode "TODO"
:keymap (make-sparse-keymap))
(add-hook 'org-agenda-mode-hook #'org-agenda-localleader-mode)
(map! :map org-agenda-mode-map
;; Always clean up after itself ;; Always clean up after itself
[remap org-agenda-quit] #'org-agenda-exit [remap org-agenda-quit] #'org-agenda-exit
[remap org-agenda-Quit] #'org-agenda-exit [remap org-agenda-Quit] #'org-agenda-exit
:map org-agenda-localleader-mode-map
:localleader :localleader
"d" #'org-agenda-deadline "d" #'org-agenda-deadline
"q" #'org-agenda-set-tags "q" #'org-agenda-set-tags
@ -620,14 +614,15 @@ between the two."
(defvar evil-org-retain-visual-state-on-shift t) (defvar evil-org-retain-visual-state-on-shift t)
(defvar evil-org-special-o/O '(table-row)) (defvar evil-org-special-o/O '(table-row))
(defvar evil-org-use-additional-insert t) (defvar evil-org-use-additional-insert t)
(add-hook 'evil-org-mode-hook #'evil-normalize-keymaps)
:config :config
;; change `evil-org-key-theme' instead (evil-org-set-key-theme evil-org-key-theme))
(advice-add #'evil-org-set-key-theme :override #'ignore))
(use-package! evil-org-agenda (use-package! evil-org-agenda
:after org-agenda :hook (org-agenda-mode . evil-org-agenda-mode)
:config (evil-org-agenda-set-keys)) :config
(evil-org-agenda-set-keys)
(evil-define-key* 'motion evil-org-agenda-mode-map
(kbd doom-leader-key) nil))
;; Only fold the current tree, rather than recursively ;; Only fold the current tree, rather than recursively
(add-hook 'org-tab-first-hook #'+org-cycle-only-current-subtree-h t) (add-hook 'org-tab-first-hook #'+org-cycle-only-current-subtree-h t)
@ -649,7 +644,6 @@ between the two."
:n "[" nil :n "[" nil
:map evil-org-mode-map :map evil-org-mode-map
:nv "TAB" #'org-cycle
:ni [C-return] #'+org/insert-item-below :ni [C-return] #'+org/insert-item-below
:ni [C-S-return] #'+org/insert-item-above :ni [C-S-return] #'+org/insert-item-above
;; navigate table cells (from insert-mode) ;; navigate table cells (from insert-mode)

2
modules/lang/org/packages.el
View file

@ -11,7 +11,7 @@
(package! org-bullets :recipe (:host github :repo "Kaligule/org-bullets")) (package! org-bullets :recipe (:host github :repo "Kaligule/org-bullets"))
(package! toc-org) (package! toc-org)
(when (featurep! :editor evil) (when (featurep! :editor evil)
(package! evil-org)) (package! evil-org :recipe (:host github :repo "hlissner/evil-org-mode")))
(when (featurep! :tools pdf) (when (featurep! :tools pdf)
(package! org-pdfview)) (package! org-pdfview))
(package! htmlize) (package! htmlize)