Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-291
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-292
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-293
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-294
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296
   Allow restarting an existing debugger session that's exited

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-298
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-162

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 0fdaf652e50..214b6f0e24c 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1343,7 +1343,7 @@ don't support `help'."
              (toggle-read-only 1)
              (setq view-return-to-alist
                    (list (cons (selected-window) help-return-method))))))
-      (help-setup-xref (list 'python-describe-symbol symbol))
+      (help-setup-xref (list 'python-describe-symbol symbol) (interactive-p))
       (with-output-to-temp-buffer (help-buffer)
         (with-current-buffer standard-output
           (set (make-local-variable 'comint-redirect-subvert-readonly) t)
@@ -1387,7 +1387,7 @@ Used with `eval-after-load'."
                     (string-match "^Python \\([0-9]+\\.[0-9]+\\>\\)" s)
                     (match-string 1 s)))
          ;; Whether info files have a Python version suffix, e.g. in Debian.
-         (versioned 
+         (versioned
           (with-temp-buffer
             (with-no-warnings (Info-mode))
             (condition-case ()