comparison lisp/progmodes/python.el @ 82221:e126e09e6ac7

Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 75-83) - Update from CVS - Remove lisp/erc/erc-nicklist.el - Update some .arch-inventory files - Indicate that emacs--devo--0--patch-834 does not need to be applied - Merge from gnus--rel--5.10 - Restore lisp/emacs-lisp/cl-loaddefs.el * gnus--rel--5.10 (patch 239-241) - Merge from emacs--devo--0 - Update from CVS 2007-07-29 Kimit Yada <kimitto@gmail.com> (tiny change) * lisp/emacs-lisp/copyright.el (copyright-update-year, copyright-update) (copyright-fix-years, copyright): Correctly handle the case where copyright-limit is nil. 2007-07-28 Konstantin Novitsky <knovitsk@Bear.com> (tiny change) * lisp/progmodes/python.el (run-python): Fix path separator under w32. 2007-07-24 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-msg.el (gnus-summary-supersede-article) (gnus-summary-resend-message-edit): Add Gcc header. (gnus-summary-resend-bounced-mail): Ditto; search whole body for parent article's Message-ID; refer parent article in summary buffer. * lisp/gnus/message.el (message-bounce): Call mime-to-mml. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-838
author Miles Bader <miles@gnu.org>
date Tue, 31 Jul 2007 05:02:54 +0000
parents b98604865ea0 fb9000547438
children bda0322e3767 539530fa389c
comparison
equal deleted inserted replaced
82220:61b5a5aa16a1 82221:e126e09e6ac7
1357 (with-current-buffer 1357 (with-current-buffer
1358 (let* ((cmdlist (append (python-args-to-list cmd) '("-i"))) 1358 (let* ((cmdlist (append (python-args-to-list cmd) '("-i")))
1359 (path (getenv "PYTHONPATH")) 1359 (path (getenv "PYTHONPATH"))
1360 (process-environment ; to import emacs.py 1360 (process-environment ; to import emacs.py
1361 (cons (concat "PYTHONPATH=" data-directory 1361 (cons (concat "PYTHONPATH=" data-directory
1362 (if path (concat ":" path))) 1362 (if path (concat path-separator path)))
1363 process-environment))) 1363 process-environment)))
1364 (apply 'make-comint-in-buffer "Python" 1364 (apply 'make-comint-in-buffer "Python"
1365 (if new (generate-new-buffer "*Python*") "*Python*") 1365 (if new (generate-new-buffer "*Python*") "*Python*")
1366 (car cmdlist) nil (cdr cmdlist))) 1366 (car cmdlist) nil (cdr cmdlist)))
1367 (setq-default python-buffer (current-buffer)) 1367 (setq-default python-buffer (current-buffer))