# HG changeset patch
# User Nick Roberts <nickrob@snap.net.nz>
# Date 1146875651 0
# Node ID 1a065139c7c33105ece5664a8dbaf34e0ec41573
# Parent  ebf8d58e2844b60e8441fef8c2ca5fd7a39f8a5f
(gdb-goto-breakpoint): Use or instead of unless so nil isn't returned.
(gdb-setup-windows, gdb-restore-windows): Reset gdb-source-window.

diff -r ebf8d58e2844 -r 1a065139c7c3 lisp/progmodes/gdb-ui.el
--- a/lisp/progmodes/gdb-ui.el	Sat May 06 00:31:23 2006 +0000
+++ b/lisp/progmodes/gdb-ui.el	Sat May 06 00:34:11 2006 +0000
@@ -1912,7 +1912,7 @@
 	    (let* ((buffer (find-file-noselect
 			 (if (file-exists-p file) file
 			   (cdr (assoc bptno gdb-location-alist)))))
-		   (window (unless (gdb-display-source-buffer buffer)
+		   (window (or (gdb-display-source-buffer buffer)
 			       (display-buffer buffer))))
 	      (setq gdb-source-window window)
 	      (with-current-buffer buffer
@@ -2754,6 +2754,7 @@
 	   ;; Put buffer list in window if we
 	   ;; can't find a source file.
 	   (list-buffers-noselect))))
+  (setq gdb-source-window (selected-window))
   (when gdb-use-separate-io-buffer
     (split-window-horizontally)
     (other-window 1)
@@ -2781,6 +2782,7 @@
        (if gud-last-last-frame
 	   (gud-find-file (car gud-last-last-frame))
 	 (gud-find-file gdb-main-file)))
+      (setq gdb-source-window (selected-window))
       (other-window 1))))
 
 (defun gdb-reset ()