diff options
| author | Miles Bader <miles@gnu.org> | 2007-07-31 05:02:54 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-07-31 05:02:54 +0000 |
| commit | 2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca (patch) | |
| tree | 165cbd151b45eb84012e017a4944c398fae79654 /lisp/progmodes/python.el | |
| parent | 22eca14e49cfc7d696534cbf90a49c3ec9b7a68c (diff) | |
| parent | bd53d37c664e18c3417da079de4bb999533886af (diff) | |
| download | emacs-2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca.tar.gz | |
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
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 1caa9ee2007..c3caa7e397c 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1359,7 +1359,7 @@ buffer for a list of commands.)" (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*") |