Mercurial > emacs
comparison lisp/progmodes/python.el @ 90998:539530fa389c
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 832-838)
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Update from CVS
- Restore lisp/emacs-lisp/cl-loaddefs.el
- Merge from emacs--rel--22
* 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
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-239
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 03 Aug 2007 05:20:51 +0000 |
| parents | f55f9811f5d7 e126e09e6ac7 |
| children | 35e3789db058 |
comparison
equal
deleted
inserted
replaced
| 90997:12fc8f96710b | 90998:539530fa389c |
|---|---|
| 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)) |
