merge trunk

2 files changed, 10 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f5b3c92f8c2..78cc1862c2f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-28  Chong Yidong  <cyd@gnu.org>
+
+        * progmodes/gdb-mi.el (gdb-get-source-file-list)
+        (gdb-get-source-file): Move mode line update to
+        gdb-get-source-file (Bug#10087).
+
 2011-12-25  Chong Yidong  <cyd@gnu.org>
 
         * progmodes/gud.el (gud-gdb-fetch-lines-filter): Just use
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 128ff4bb143..1c38c59bba6 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3787,9 +3787,7 @@ is set in them."
   (dolist (buffer (buffer-list))
     (with-current-buffer buffer
       (when (member buffer-file-name gdb-source-file-list)
-        (gdb-init-buffer))))
-  (gdb-force-mode-line-update
-   (propertize "ready" 'face font-lock-variable-name-face)))
+        (gdb-init-buffer)))))
 
 (defun gdb-get-main-selected-frame ()
   "Trigger for `gdb-frame-handler' which uses main current
@@ -4128,7 +4126,9 @@ buffers, if required."
     (gdb-get-buffer-create 'gdb-breakpoints-buffer)
     (if (and gdb-show-main gdb-main-file)
         (let ((pop-up-windows t))
-          (display-buffer (gud-find-file gdb-main-file))))))
+          (display-buffer (gud-find-file gdb-main-file)))))
+  (gdb-force-mode-line-update
+   (propertize "ready" 'face font-lock-variable-name-face)))
 
 ;;from put-image
 (defun gdb-put-string (putstring pos &optional dprop &rest sprops)