From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Schulte Subject: Re: [PATCH] ob-python Date: Mon, 12 Aug 2013 13:19:04 -0600 Message-ID: <871u5yn2dz.fsf@gmail.com> References: <87siyeu3jj.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:33024) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8xgb-00074u-Lc for emacs-orgmode@gnu.org; Mon, 12 Aug 2013 15:21:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V8xgX-0001rx-Bh for emacs-orgmode@gnu.org; Mon, 12 Aug 2013 15:21:49 -0400 Received: from mail-pd0-x22e.google.com ([2607:f8b0:400e:c02::22e]:34552) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V8xgX-0001ra-4D for emacs-orgmode@gnu.org; Mon, 12 Aug 2013 15:21:45 -0400 Received: by mail-pd0-f174.google.com with SMTP id y13so3846183pdi.19 for ; Mon, 12 Aug 2013 12:21:43 -0700 (PDT) In-Reply-To: <87siyeu3jj.fsf@Rainer.invalid> (Achim Gratz's message of "Mon, 12 Aug 2013 21:12:16 +0200") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: Achim Gratz Cc: emacs-orgmode@gnu.org Applied. Thanks, Achim Gratz writes: > 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 > > > > Regards, > Achim. -- Eric Schulte https://cs.unm.edu/~eschulte PGP: 0x614CA05D