From afdec75cbca7da70febdd1df2ebf8692f9c81ae9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 10 Jul 2019 21:50:54 +0200 Subject: [PATCH] lang/org: refactor ob-ipython advice --- modules/lang/org/autoload/contrib-ipython.el | 8 ++------ modules/lang/org/contrib/ipython.el | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/modules/lang/org/autoload/contrib-ipython.el b/modules/lang/org/autoload/contrib-ipython.el index 6922f7c83..10296d2e4 100644 --- a/modules/lang/org/autoload/contrib-ipython.el +++ b/modules/lang/org/autoload/contrib-ipython.el @@ -92,12 +92,8 @@ create a repl connecting to remote session." "Execute a BODY of IPython code with PARAMS in org-babel. This function is called by `org-babel-execute-src-block'." (message default-directory) - (let ((session (cdr (assoc :session params)))) - (org-babel-ipython-initiate-session session params)) - (ob-ipython--clear-output-buffer) - (if (cdr (assoc :async params)) - (ob-ipython--execute-async body params) - (ob-ipython--execute-sync body params))) + (org-babel-ipython-initiate-session (cdr (assoc :session params)) + params)) ;; diff --git a/modules/lang/org/contrib/ipython.el b/modules/lang/org/contrib/ipython.el index d240e8050..1dfb5eef2 100644 --- a/modules/lang/org/contrib/ipython.el +++ b/modules/lang/org/contrib/ipython.el @@ -27,7 +27,7 @@ ;; advices for remote kernel and org-src-edit (advice-add #'ob-ipython--create-repl :override #'+org*ob-ipython--create-repl) (advice-add #'org-babel-edit-prep:ipython :override #'+org*babel-edit-prep:ipython) - (advice-add #'org-babel-execute:ipython :override #'+org*babel-execute:ipython) + (advice-add #'org-babel-execute:ipython :before #'+org*babel-execute:ipython) (advice-add #'org-babel-ipython-initiate-session :override #'+org*ob-ipython-initiate-session) ;; retina resolution image hack