(ps-print-preprint): Special handling if

[gnu-emacs] / lisp / gud.el

diff --git a/lisp/gud.el b/lisp/gud.el
index 0f8776f3529eed577744862e6c94a29bbc1c1ad2..b42d9a200119cf568b0434dc93e207529bc9ef3a 100644 (file)
--- a/lisp/gud.el
+++ b/lisp/gud.el
@@ -1,5 +1,4 @@
-;;; gud.el --- Grand Unified Debugger mode for gdb, sdb, dbx, or xdb
-;;;            under Emacs
+;;; gud.el --- Grand Unified Debugger mode for gdb, sdb, dbx, or xdb under Emacs
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
@@ -20,8 +19,9 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to
-;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -413,13 +413,13 @@ available with older versions of GDB."
     (while 
        (cond 
         ;; System V Release 3.2 uses this format
-        ((string-match "\\(^0x\\w* in \\|^\\|\n\\)\\([^:\n]*\\):\\([0-9]*\\):.*\n"
+        ((string-match "\\(^\\|\n\\)\\*?\\(0x\\w* in \\)?\\([^:\n]*\\):\\([0-9]*\\):.*\n"
                        gud-marker-acc start)
          (setq gud-last-frame
                (cons
-                (substring gud-marker-acc (match-beginning 2) (match-end 2))
+                (substring gud-marker-acc (match-beginning 3) (match-end 3))
                 (string-to-int 
-                 (substring gud-marker-acc (match-beginning 3) (match-end 3))))))
+                 (substring gud-marker-acc (match-beginning 4) (match-end 4))))))
         ;; System V Release 4.0 quite often clumps two lines together
         ((string-match "^\\(BREAKPOINT\\|STEPPED\\) process [0-9]+ function [^ ]+ in \\(.+\\)\n\\([0-9]+\\):" 
                        gud-marker-acc start)
@@ -451,12 +451,7 @@ available with older versions of GDB."
       (setq start (match-end 0)))
 
     ;; If we have an incomplete line, store it in gud-marker-acc.
-    ;; Otherwise clear gud-marker-acc. to avoid an
-    ;; unnecessary concat when this function runs next.
-    (setq gud-marker-acc 
-         (if (= start (length gud-marker-acc))
-             (substring gud-marker-acc start)
-           nil)))
+    (setq gud-marker-acc (substring gud-marker-acc (or start 0))))
   string)
 
 (defun gud-sdb-find-file (f)
@@ -1060,8 +1055,9 @@ and source-file directory for your debugger."
   "Major mode for interacting with an inferior debugger process.
 
    You start it up with one of the commands M-x gdb, M-x sdb, M-x dbx,
-or M-x xdb.  Each entry point finishes by executing a hook; `gdb-mode-hook',
-`sdb-mode-hook', `dbx-mode-hook' or `xdb-mode-hook' respectively.
+M-x perldb, or M-x xdb.  Each entry point finishes by executing a
+hook; `gdb-mode-hook', `sdb-mode-hook', `dbx-mode-hook',
+`perldb-mode-hook', or `xdb-mode-hook' respectively.
 
 After startup, the following commands are available in both the GUD
 interaction buffer and any source buffer GUD visits due to a breakpoint stop
@@ -1322,7 +1318,11 @@ Obeying it means displaying in another window the specified file and line."
 
 (defun gud-display-line (true-file line)
   (let* ((last-nonmenu-event t)         ; Prevent use of dialog box for questions.
-        (buffer (gud-find-file true-file))
+        (buffer
+         (save-excursion
+           (or (eq (current-buffer) gud-comint-buffer)
+               (set-buffer gud-comint-buffer))
+           (gud-find-file true-file)))
         (window (display-buffer buffer))
         (pos))
 ;;;    (if (equal buffer (current-buffer))