[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el, v [EMACS_22_BASE]

[Nick Roberts]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Nick Roberts <nickrob>  08/01/10 10:27:03

Index: gdb-ui.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/gdb-ui.el,v
retrieving revision 1.206.2.15
retrieving revision 1.206.2.16
diff -u -b -r1.206.2.15 -r1.206.2.16
--- gdb-ui.el   8 Jan 2008 01:59:29 -0000       1.206.2.15
+++ gdb-ui.el   10 Jan 2008 10:27:02 -0000      1.206.2.16
@@ -1214,10 +1214,12 @@
 
 (defun gdb-dequeue-input ()
   (let ((queue gdb-input-queue))
-    (and queue
+    (if queue
         (let ((last (car (last queue))))
           (unless (nbutlast queue) (setq gdb-input-queue '()))
-          last))))
+         last)
+      ;; This should be nil here anyway but set it just to make sure.
+      (setq gdb-pending-triggers nil))))
 
 (defun gdb-send-item (item)
   (setq gdb-flush-pending-output nil)
@@ -3442,7 +3444,8 @@
       (let ((buffer (marker-buffer gud-overlay-arrow-position))
            (position (marker-position gud-overlay-arrow-position)))
        (when (and buffer
-                  (string-equal (buffer-name buffer)
+                  (string-equal (file-name-nondirectory
+                                 (buffer-file-name buffer))
                                 (file-name-nondirectory (match-string 3))))
          (with-current-buffer buffer
            (setq fringe-indicator-alist