From 0745bc2e980a4bc760cdc6d90a5d02a30712e6d9 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Sat, 6 May 2006 00:34:11 +0000 Subject: [PATCH] (gdb-goto-breakpoint): Use or instead of unless so nil isn't returned. (gdb-setup-windows, gdb-restore-windows): Reset gdb-source-window. --- lisp/progmodes/gdb-ui.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 28fcb70bb8b..19f6306b88a 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -1912,7 +1912,7 @@ static char *magick[] = { (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 @@ corresponding to the mode line clicked." ;; 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 @@ This arrangement depends on the value of `gdb-many-windows'." (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 () -- 2.39.2