From: Nick Roberts <nickrob@snap.net.nz>
Date: Mon, 14 Dec 2009 09:44:43 +0000 (+0000)
Subject: (gdb-frame-handler): Only set gud-lat-frame
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~5741
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e960eea6858c14dc39134438ef72040e53d94b97;p=emacs.git

(gdb-frame-handler): Only set gud-lat-frame
when there are values for both file and line. (Bug#5060)
---

diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 703f4ac6162..0f9532dcb3e 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3754,9 +3754,8 @@ overlay arrow in source buffer."
       (setq gdb-frame-number (bindat-get-field frame 'level))
       (setq gdb-frame-address (bindat-get-field frame 'addr))
       (let ((line (bindat-get-field frame 'line)))
-        (setq gdb-selected-line (or (and line (string-to-number line))
-                                    nil)) ; don't fail if line is nil
-        (when line ; obey the current file only if we have line info
+        (setq gdb-selected-line (and line (string-to-number line)))
+        (when (and gdb-selected-file gdb-selected-line)
           (setq gud-last-frame (cons gdb-selected-file gdb-selected-line))
           (gud-display-frame)))
       (if gud-overlay-arrow-position