From 0e50db55a006803cd91484990f2993ffc0e46686 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Tue, 28 Apr 2020 18:43:15 -0400 Subject: [PATCH] Fix #2972: infinite recursion in org + python src blocks --- modules/lang/org/config.el | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/lang/org/config.el b/modules/lang/org/config.el index 4a2b58faa..a4c94cd0a 100644 --- a/modules/lang/org/config.el +++ b/modules/lang/org/config.el @@ -168,12 +168,6 @@ This forces it to read the background before rendering." ("HOLD" . +org-todo-onhold) ("PROJ" . +org-todo-project))) - (after! org-eldoc - ;; HACK Fix #2972: infinite recursion when eldoc kicks in in an 'org' src - ;; block. - ;; TODO Should be reported upstream! - (puthash "org" "ignore" org-eldoc-local-functions-cache)) - (defadvice! +org-display-link-in-eldoc-a (&rest args) "Display full link in minibuffer when cursor/mouse is over it." :before-until #'org-eldoc-documentation-function @@ -501,6 +495,13 @@ eldoc string." nil 'face `(:foreground ,(face-foreground face nil t) :weight bold))) width prefix separator)) + (after! org-eldoc + ;; HACK Fix #2972: infinite recursion when eldoc kicks in in 'org' or + ;; 'python' src blocks. + ;; TODO Should be reported upstream! + (puthash "org" #'ignore org-eldoc-local-functions-cache) + (puthash "python" #'python-eldoc-function org-eldoc-local-functions-cache)) + (defun +org--restart-mode-h () "Restart `org-mode', but only once." (quiet! (org-mode-restart))