2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e365346c972..d61a0a67673 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-18  Dima Kogan  <dima@secretsauce.net>
+
+        Have gud-display-line not display source buffer in gud window.
+        * lisp/progmodes/gud.el (gud-display-line): Make display-buffer
+        not reuse selected window.  (Bug#17675, Bug#19901, Bug#20034)
+
 2015-03-17  Tassilo Horn  <tsdh@gnu.org>
 
         * emacs-lisp/byte-run.el (macro-declarations-alist): New
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 29a6dc63a68..9ab0667b5ba 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -2813,7 +2813,7 @@ Obeying it means displaying in another window the specified file and line."
             (gud-find-file true-file)))
          (window (and buffer
                       (or (get-buffer-window buffer)
-                          (display-buffer buffer))))
+                          (display-buffer buffer '(nil (inhibit-same-window . t))))))
          (pos))
     (when buffer
       (with-current-buffer buffer