summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Roberts <nickrob@snap.net.nz>2006-05-06 00:34:11 +0000
committerNick Roberts <nickrob@snap.net.nz>2006-05-06 00:34:11 +0000
commit0745bc2e980a4bc760cdc6d90a5d02a30712e6d9 (patch)
treea784e17f8343d880019f21cb61ccb03aa848ff9e
parent9d74382f6f75aafbd7eab700107bb1e31f640c8a (diff)
downloademacs-0745bc2e980a4bc760cdc6d90a5d02a30712e6d9.tar.gz
(gdb-goto-breakpoint): Use or instead of unless so nil isn't returned.
(gdb-setup-windows, gdb-restore-windows): Reset gdb-source-window.
-rw-r--r--lisp/progmodes/gdb-ui.el4
1 files changed, 3 insertions, 1 deletions
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 ()