 `py-jpython-command-args' are consulted to determine the interpreter
 and arguments to use.
 
-Note that this variable is consulted only the first time that a Python 
-interpreter shell is started during an Emacs session.  After that, use 
+Note that this variable is consulted only the first time that a Python
+mode buffer is visited during an Emacs session.  After that, use
 \\[py-toggle-shells] to change the interpreter shell."
   :type '(choice (const :tag "Python (a.k.a. CPython)" cpython)
 		 (const :tag "JPython" jpython))


(defun py-toggle-shells (arg)
  "Toggles between the CPython and JPython shells.
With positive argument ARG (interactively \\[universal-argument]),
uses the CPython shell, with negative ARG uses the JPython shell, and
with a zero argument, toggles the shell."
  (interactive "P")
  ;; default is to toggle
  (if (null arg)
      (setq arg 0))
  ;; toggle if zero
  (if (= arg 0)
      (if (string-equal py-which-bufname "Python")
	  (setq arg -1)
	(setq arg 1)))
  (let (msg)
    (cond
     ((< 0 arg)

non-Python process buffers using the default (Emacs-supplied) process
filter."
  (interactive "P")
  (let ((args py-which-args))
    (when (and argprompt
	       (interactive-p)
