From 8e76097d49549f845736e234d10b8bcd85be6fc7 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 23 Aug 2024 16:59:59 -0400 Subject: [PATCH] fix(org): respect evil-disable-insert-state-bindings Close: #8023 Co-authored-by: ambirdsall --- modules/lang/org/config.el | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index cf03dc42b..f8404075f 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -1207,19 +1207,23 @@ between the two." (map! :map evil-org-mode-map :ni [C-return] #'+org/insert-item-below :ni [C-S-return] #'+org/insert-item-above - ;; navigate table cells (from insert-mode) - :i Cright (cmds! (org-at-table-p) #'org-table-next-field - #'org-end-of-line) - :i Cleft (cmds! (org-at-table-p) #'org-table-previous-field - #'org-beginning-of-line) - :i Cup (cmds! (org-at-table-p) #'+org/table-previous-row - #'org-up-element) - :i Cdown (cmds! (org-at-table-p) #'org-table-next-row - #'org-down-element) - :ni CSright #'org-shiftright - :ni CSleft #'org-shiftleft - :ni CSup #'org-shiftup - :ni CSdown #'org-shiftdown + (:unless evil-disable-insert-state-bindings + :i Cright (cmds! (org-at-table-p) #'org-table-next-field + #'org-end-of-line) + :i Cleft (cmds! (org-at-table-p) #'org-table-previous-field + #'org-beginning-of-line) + :i Cup (cmds! (org-at-table-p) #'+org/table-previous-row + #'org-up-element) + :i Cdown (cmds! (org-at-table-p) #'org-table-next-row + #'org-down-element) + :i CSright #'org-shiftright + :i CSleft #'org-shiftleft + :i CSup #'org-shiftup + :i CSdown #'org-shiftdown) + :n CSright #'org-shiftright + :n CSleft #'org-shiftleft + :n CSup #'org-shiftup + :n CSdown #'org-shiftdown ;; more intuitive RET keybinds :n [return] #'+org/dwim-at-point :n "RET" #'+org/dwim-at-point