Merged from emacs@sv.gnu.org.

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-294
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-295
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-296
   Update from CVS: admin/FOR-RELEASE: Update refcard section.

 * emacs@sv.gnu.org/emacs--devo--0--patch-297
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-298
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-299
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-300
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-301
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-302
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-303
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-304
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-103
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-104
   Update from CVS

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

1 files changed, 43 insertions, 40 deletions

diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index bda30b196e1..1ce5d404a80 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -101,8 +101,8 @@ If SOFT is non-nil, returns nil if the symbol doesn't already exist."
     (if (boundp sym) (symbol-value sym))))
 
 (defvar gud-running nil
-  "Non-nil if debuggee is running.
-Used to grey out relevant togolbar icons.")
+  "Non-nil if debugged program is running.
+Used to grey out relevant toolbar icons.")
 
 ;; Use existing Info buffer, if possible.
 (defun gud-goto-info ()
@@ -130,10 +130,10 @@ Used to grey out relevant togolbar icons.")
 
 (defun gud-stop-subjob ()
   (interactive)
-  (if (string-equal
-       (buffer-local-value 'gud-target-name gud-comint-buffer) "emacs")
-      (comint-stop-subjob)
-    (comint-interrupt-subjob)))
+  (with-current-buffer gud-comint-buffer
+    (if (string-equal gud-target-name "emacs")
+	(comint-stop-subjob)
+      (comint-interrupt-subjob))))
 
 (easy-mmode-defmap gud-menu-map
   '(([help]     "Info" . gud-goto-info)
@@ -141,13 +141,15 @@ Used to grey out relevant togolbar icons.")
                   :enable (and (not emacs-basic-display)
 			       (display-graphic-p)
 			       (fboundp 'x-show-tip))
+		  :visible (memq gud-minor-mode
+				'(gdbmi gdba dbx sdb xdb pdb))
 	          :button (:toggle . gud-tooltip-mode))
     ([refresh]	"Refresh" . gud-refresh)
     ([run]	menu-item "Run" gud-run
-                  :enable (and (not gud-running)
-			       (memq gud-minor-mode '(gdbmi gdb dbx jdb)))
-		  :visible (not (eq gud-minor-mode 'gdba)))
-    ([go]	menu-item "Run/Continue" gud-go
+                  :enable (not gud-running)
+		  :visible (and (memq gud-minor-mode '(gdbmi gdb dbx jdb))
+				(not (eq gud-minor-mode 'gdba))))
+    ([go]	menu-item (if gdb-active-process "Continue" "Run") gud-go
 		  :visible (and (not gud-running)
 				(eq gud-minor-mode 'gdba)))
     ([stop]	menu-item "Stop" gud-stop-subjob
@@ -155,26 +157,27 @@ Used to grey out relevant togolbar icons.")
 			       (and gud-running
 				    (eq gud-minor-mode 'gdba))))
     ([until]	menu-item "Continue to selection" gud-until
-                  :enable (and (not gud-running)
-			       (memq gud-minor-mode '(gdbmi gdba gdb perldb)))
-		  :visible (gud-tool-bar-item-visible-no-fringe))
+                  :enable (not gud-running)
+		  :visible (and (memq gud-minor-mode '(gdbmi gdba gdb perldb))
+				(gud-tool-bar-item-visible-no-fringe)))
     ([remove]	menu-item "Remove Breakpoint" gud-remove
                   :enable (not gud-running)
 		  :visible (gud-tool-bar-item-visible-no-fringe))
     ([tbreak]	menu-item "Temporary Breakpoint" gud-tbreak
-		  :enable (memq gud-minor-mode
+                  :enable (not gud-running)
+		  :visible (memq gud-minor-mode
 				'(gdbmi gdba gdb sdb xdb bashdb)))
     ([break]	menu-item "Set Breakpoint" gud-break
                   :enable (not gud-running)
 		  :visible (gud-tool-bar-item-visible-no-fringe))
     ([up]	menu-item "Up Stack" gud-up
-		  :enable (and (not gud-running)
-			       (memq gud-minor-mode
-				     '(gdbmi gdba gdb dbx xdb jdb pdb bashdb))))
+		  :enable (not gud-running)
+		  :visible (memq gud-minor-mode
+				 '(gdbmi gdba gdb dbx xdb jdb pdb bashdb)))
     ([down]	menu-item "Down Stack" gud-down
-		  :enable (and (not gud-running)
-			       (memq gud-minor-mode
-				     '(gdbmi gdba gdb dbx xdb jdb pdb bashdb))))
+		  :enable (not gud-running)
+		  :visible (memq gud-minor-mode
+				 '(gdbmi gdba gdb dbx xdb jdb pdb bashdb)))
     ([pp]	menu-item "Print S-expression" gud-pp
                   :enable (and (not gud-running)
 				  gdb-active-process)
@@ -183,23 +186,23 @@ Used to grey out relevant togolbar icons.")
 				  'gud-target-name gud-comint-buffer) "emacs")
 				(eq gud-minor-mode 'gdba)))
     ([print*]	menu-item "Print Dereference" gud-pstar
-                  :enable (and (not gud-running)
-			       (memq gud-minor-mode '(gdbmi gdba gdb))))
+                  :enable (not gud-running)
+		  :visible (memq gud-minor-mode '(gdbmi gdba gdb)))
     ([print]	menu-item "Print Expression" gud-print
                   :enable (not gud-running))
     ([watch]	menu-item "Watch Expression" gud-watch
-		  :enable (and (not gud-running)
-			       (memq gud-minor-mode '(gdbmi gdba))))
+		  :enable (not gud-running)
+	  	  :visible (memq gud-minor-mode '(gdbmi gdba)))
     ([finish]	menu-item "Finish Function" gud-finish
-                  :enable (and (not gud-running)
-			       (memq gud-minor-mode
-				     '(gdbmi gdba gdb xdb jdb pdb bashdb))))
+                  :enable (not gud-running)
+		  :visible (memq gud-minor-mode
+				 '(gdbmi gdba gdb xdb jdb pdb bashdb)))
     ([stepi]	menu-item "Step Instruction" gud-stepi
-                  :enable (and (not gud-running)
-			       (memq gud-minor-mode '(gdbmi gdba gdb dbx))))
+                  :enable (not gud-running)
+		  :visible (memq gud-minor-mode '(gdbmi gdba gdb dbx)))
     ([nexti]	menu-item "Next Instruction" gud-nexti
-                  :enable (and (not gud-running)
-			       (memq gud-minor-mode '(gdbmi gdba gdb dbx))))
+                  :enable (not gud-running)
+		  :visible (memq gud-minor-mode '(gdbmi gdba gdb dbx)))
     ([step]	menu-item "Step Line" gud-step
                   :enable (not gud-running))
     ([next]	menu-item "Next Line" gud-next
@@ -2565,7 +2568,7 @@ comint mode, which see."
 	 (existing-buffer (get-buffer (concat "*gud" filepart "*"))))
     (pop-to-buffer (concat "*gud" filepart "*"))
     (when (and existing-buffer (get-buffer-process existing-buffer))
-      (error "This program is already running under gdb"))
+      (error "This program is already being debugged"))
     ;; Set the dir, in case the buffer already existed with a different dir.
     (setq default-directory dir)
     ;; Set default-directory to the file's directory.
@@ -2693,10 +2696,10 @@ It is saved for when this flag is not set.")
 	((memq (process-status proc) '(signal exit))
 	 ;; Stop displaying an arrow in a source file.
 	 (setq gud-overlay-arrow-position nil)
-	 (with-current-buffer gud-comint-buffer
-	   (if (memq gud-minor-mode-type '(gdbmi gdba))
-	       (gdb-reset)
-	     (gud-reset)))
+	 (if (memq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
+		   '(gdba gdbmi))
+	     (gdb-reset)
+	   (gud-reset))
 	 (let* ((obuf (current-buffer)))
 	   ;; save-excursion isn't the right thing if
 	   ;;  process-buffer is current-buffer
@@ -3313,7 +3316,8 @@ Treats actions as defuns."
 	(kill-local-variable 'gdb-define-alist)
 	(remove-hook 'after-save-hook 'gdb-create-define-alist t))))
 
-(defcustom gud-tooltip-modes '(gud-mode c-mode c++-mode fortran-mode)
+(defcustom gud-tooltip-modes '(gud-mode c-mode c++-mode fortran-mode
+					python-mode)
   "List of modes for which to enable GUD tooltips."
   :type 'sexp
   :group 'gud
@@ -3427,9 +3431,8 @@ With arg, dereference expr iff arg is positive."
   (case gud-minor-mode
 	(gdba (concat "server print " expr))
 	((dbx gdbmi) (concat "print " expr))
-	(xdb (concat "p " expr))
-	(sdb (concat expr "/"))
-	(perldb expr)))
+	((xdb pdb) (concat "p " expr))
+	(sdb (concat expr "/"))))
 
 (defun gud-tooltip-tips (event)
   "Show tip for identifier or selection under the mouse.