From 8f3c510f43e458a1bbb58b126fc4e402007e6cfe Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Mon, 12 Aug 2013 21:10:27 +0200 Subject: [PATCH] ob-python: run-python requires argument cmd * lisp/ob-python.el: Supply non-optional argument `cmd' to all invocations of `run-python'. Invert a condition of to remove an expendable progn form. 46d05e4d08 corrected the signatore in the declaration of run-python, but the call without an argument was left in. --- lisp/ob-python.el | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lisp/ob-python.el b/lisp/ob-python.el index ec24177..17da109 100644 --- a/lisp/ob-python.el +++ b/lisp/ob-python.el @@ -179,21 +179,20 @@ (defun org-babel-python-initiate-session-by-key (&optional session) (require org-babel-python-mode) (save-window-excursion (let* ((session (if session (intern session) :default)) - (python-buffer (org-babel-python-session-buffer session))) + (python-buffer (org-babel-python-session-buffer session)) + (cmd (if (member system-type '(cygwin windows-nt ms-dos)) + (concat org-babel-python-command " -i") + org-babel-python-command))) (cond ((and (eq 'python org-babel-python-mode) (fboundp 'run-python)) ; python.el - (if (version< "24.1" emacs-version) - (progn - (unless python-buffer - (setq python-buffer (org-babel-python-with-earmufs session))) - (let ((python-shell-buffer-name - (org-babel-python-without-earmufs python-buffer))) - (run-python - (if (member system-type '(cygwin windows-nt ms-dos)) - (concat org-babel-python-command " -i") - org-babel-python-command)))) - (run-python))) + (if (not (version< "24.1" emacs-version)) + (run-python cmd) + (unless python-buffer + (setq python-buffer (org-babel-python-with-earmufs session))) + (let ((python-shell-buffer-name + (org-babel-python-without-earmufs python-buffer))) + (run-python cmd)))) ((and (eq 'python-mode org-babel-python-mode) (fboundp 'py-shell)) ; python-mode.el ;; Make sure that py-which-bufname is initialized, as otherwise -- 1.8.3.4