Merged in changes from CVS trunk.

Patches applied:

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

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

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328
   Update from CVS: src/.gdbinit (xsymbol): Fix last change.

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


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

2 files changed, 15 insertions, 16 deletions

diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 19c57979130..1fa6f8f2645 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1728,15 +1728,15 @@ This arrangement depends on the value of `gdb-many-windows'."
   "Exit a debugging session cleanly by killing the gdb buffers and resetting
  the source buffers."
   (dolist (buffer (buffer-list))
-    (if (not (eq buffer gud-comint-buffer))
-        (with-current-buffer buffer
-          (if (memq gud-minor-mode '(gdba pdb))
-              (if (string-match "^\*.+*$" (buffer-name))
-                  (kill-buffer nil)
-                (gdb-remove-breakpoint-icons (point-min) (point-max) t)
-                (setq gud-minor-mode nil)
-                (kill-local-variable 'tool-bar-map)
-                (setq gud-running nil))))))
+    (unless (eq buffer gud-comint-buffer)
+      (with-current-buffer buffer
+        (if (memq gud-minor-mode '(gdba pdb))
+            (if (string-match "\\`\\*.+\\*\\'" (buffer-name))
+                (kill-buffer nil)
+              (gdb-remove-breakpoint-icons (point-min) (point-max) t)
+              (setq gud-minor-mode nil)
+              (kill-local-variable 'tool-bar-map)
+              (setq gud-running nil))))))
   (when (markerp gdb-overlay-arrow-position)
     (move-marker gdb-overlay-arrow-position nil)
     (setq gdb-overlay-arrow-position nil))
@@ -2013,5 +2013,5 @@ BUFFER nil or omitted means use the current buffer."
 
 (provide 'gdb-ui)
 
-;;; arch-tag: e9fb00c5-74ef-469f-a088-37384caae352
+;; arch-tag: e9fb00c5-74ef-469f-a088-37384caae352
 ;;; gdb-ui.el ends here
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 84dec78d895..eb0b887bdf3 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2554,12 +2554,11 @@ It is saved for when this flag is not set.")
 
 (defun gud-reset ()
   (dolist (buffer (buffer-list))
-    (if (not (eq buffer gud-comint-buffer))
-        (save-excursion
-          (set-buffer buffer)
-          (when gud-minor-mode
-            (setq gud-minor-mode nil)
-            (kill-local-variable 'tool-bar-map))))))
+    (unless (eq buffer gud-comint-buffer)
+      (with-current-buffer buffer
+        (when gud-minor-mode
+          (setq gud-minor-mode nil)
+          (kill-local-variable 'tool-bar-map))))))
 
 (defun gud-display-frame ()
   "Find and obey the last filename-and-line marker from the debugger.