From 1a484753b2d5cc6c26a27ef7c2f913eca4db873c Mon Sep 17 00:00:00 2001
From: Glenn Morris
Date: Wed, 25 Jul 2007 04:29:40 +0000
Subject: Switch license to GPLv3 or later.

---
 lisp/progmodes/python.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/progmodes/python.el')

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index cc8c44a4676..1a84d461dba 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -11,7 +11,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
-- 
cgit v1.2.1


From 0b3ef4f1e577e614026f21e4f936b09ec3826cf5 Mon Sep 17 00:00:00 2001
From: Stefan Monnier
Date: Sat, 28 Jul 2007 20:24:19 +0000
Subject: (run-python): Fix path separator under w32.

---
 lisp/progmodes/python.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lisp/progmodes/python.el')

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 1a84d461dba..ca18f772970 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1351,7 +1351,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*")
-- 
cgit v1.2.1