progmodes/gdb-mi.el (gdb-init-1): Condition execution of gdb-get-source-file-list on gdb-create-source-file-list.

2 files changed, 9 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 32de942b038..7ca29e33023 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-27  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-mi.el (gdb-init-1): Condition execution of
+          gdb-get-source-file-list on gdb-create-source-file-list.
+
 2011-11-26  Eli Zaretskii  <eliz@gnu.org>
 
         * whitespace.el (whitespace-newline): Use a different foreground
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index a1a41bd0b1b..ba3f938d718 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -873,13 +873,13 @@ detailed description of this mode.
     (gdb-input (list "-gdb-set non-stop 1" 'gdb-non-stop-handler)))
 
   ;; find source file and compilation directory here
-  (gdb-input
-                                        ; Needs GDB 6.2 onwards.
-   (list "-file-list-exec-source-files" 'gdb-get-source-file-list))
   (if gdb-create-source-file-list
       (gdb-input
+                                        ; Needs GDB 6.2 onwards.
+       (list "-file-list-exec-source-files" 'gdb-get-source-file-list)))
+  (gdb-input
                                         ; Needs GDB 6.0 onwards.
-       (list "-file-list-exec-source-file" 'gdb-get-source-file)))
+   (list "-file-list-exec-source-file" 'gdb-get-source-file))
   (gdb-input
    (list "-gdb-show prompt" 'gdb-get-prompt)))