Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/lisp/progmodes/python.el Mon Jul 30 04:58:52 2007 +0000 +++ b/lisp/progmodes/python.el Fri Aug 03 05:20:51 2007 +0000 @@ -1359,7 +1359,7 @@ (path (getenv "PYTHONPATH")) (process-environment ; to import emacs.py (cons (concat "PYTHONPATH=" data-directory - (if path (concat ":" path))) + (if path (concat path-separator path))) process-environment))) (apply 'make-comint-in-buffer "Python" (if new (generate-new-buffer "*Python*") "*Python*")
