(dbx): Delete call to gud-switch-to-buffer.

(gud-sdb-marker-filter): Handle SVR4 clumped lines.

1 files changed, 10 insertions, 2 deletions

diff --git a/lisp/gud.el b/lisp/gud.el
index c43f6e2d4ab..ed86d0fc655 100644
--- a/lisp/gud.el
+++ b/lisp/gud.el
@@ -362,6 +362,16 @@ available with older versions of GDB."
            (substring string (match-beginning 2) (match-end 2))
            (string-to-int 
             (substring string (match-beginning 3) (match-end 3))))))
+   ;; System V Release 4.0 quite often clumps two lines together
+   ((string-match "^\\(BREAKPOINT\\|STEPPED\\) process [0-9]+ function [^ ]+ in \\(.+\\)\n\\([0-9]+\\):" 
+                  string)
+    (setq gud-sdb-lastfile
+          (substring string (match-beginning 2) (match-end 2)))
+    (setq gud-last-frame
+          (cons
+           gud-sdb-lastfile
+           (string-to-int 
+            (substring string (match-beginning 3) (match-end 3))))))
    ;; System V Release 4.0 
    ((string-match "^\\(BREAKPOINT\\|STEPPED\\) process [0-9]+ function [^ ]+ in \\(.+\\)\n"
                        string)
@@ -594,8 +604,6 @@ and source-file directory for your debugger."
                                nil nil
                                '(gud-dbx-history . 1))))
 
-  (gud-switch-to-buffer command-line)
-
   (cond
    (gud-mips-p
     (gud-common-init command-line 'gud-mipsdbx-massage-args