From: Eric Schulte <schulte.eric@gmail.com>
To: Achim Gratz <Stromeko@nexgo.de>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] ob-python
Date: Mon, 12 Aug 2013 13:19:04 -0600 [thread overview]
Message-ID: <871u5yn2dz.fsf@gmail.com> (raw)
In-Reply-To: <87siyeu3jj.fsf@Rainer.invalid> (Achim Gratz's message of "Mon, 12 Aug 2013 21:12:16 +0200")
Applied. Thanks,
Achim Gratz <Stromeko@nexgo.de> writes:
> From 8f3c510f43e458a1bbb58b126fc4e402007e6cfe Mon Sep 17 00:00:00 2001
> From: Achim Gratz <Stromeko@Stromeko.DE>
> 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
prev parent reply other threads:[~2013-08-12 19:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-12 19:12 [PATCH] ob-python Achim Gratz
2013-08-12 19:19 ` Eric Schulte [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=871u5yn2dz.fsf@gmail.com \
--to=schulte.eric@gmail.com \
--cc=Stromeko@nexgo.de \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).