(py-execute-region): When temp-names are broken (Emacs 19.34), a

serial number isn't enough to uniquify the temp file name -- what if
two users are on the same machine?  Add in the (emacs-pid) to help
further.  Should never be tickled on Emacs 20, XEmacs 20, 21.

diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index abc20ab09d68012644290f575a6af7ad9e524cd3..fe177b71a04a2363a008af3168f3eeac86cc39f0 100644 (file)
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -1329,9 +1329,13 @@ is inserted at the end.  See also the command `py-clear-queue'."
       (error "Region is empty"))
   (let* ((proc (get-process "Python"))
         (temp (if (memq 'broken-temp-names py-emacs-features)
-                  (prog1
-                      (format "python-%d" py-serial-number)
-                    (setq py-serial-number (1+ py-serial-number)))
+                  (let
+                      ((sn py-serial-number)
+                       (pid (and (fboundp 'emacs-pid) (emacs-pid))))
+                    (setq py-serial-number (1+ py-serial-number))
+                    (if pid
+                        (format "python-%d-%d" sn pid)
+                      (format "python-%d" sn)))
                 (make-temp-name "python-")))
         (file (expand-file-name temp py-temp-directory)))
     (write-region start end file nil 'nomsg)