[Emacs-diffs] Changes to emacs/lisp/progmodes/gud.el

[Nick Roberts]

Index: emacs/lisp/progmodes/gud.el
diff -c emacs/lisp/progmodes/gud.el:1.76 emacs/lisp/progmodes/gud.el:1.77
*** emacs/lisp/progmodes/gud.el:1.76    Thu Nov 24 00:36:03 2005
--- emacs/lisp/progmodes/gud.el Sun Nov 27 22:17:29 2005
***************
*** 453,459 ****
              (raise-frame speedbar-frame))
          (let ((var-list gdb-var-list))
            (while var-list
!             (let* ((depth 0) (start 0) (char ?+)
                     (var (car var-list)) (varnum (nth 1 var)))
                (while (string-match "\\." varnum start)
                  (setq depth (1+ depth)
--- 453,459 ----
              (raise-frame speedbar-frame))
          (let ((var-list gdb-var-list))
            (while var-list
!             (let* (char (depth 0) (start 0)
                     (var (car var-list)) (varnum (nth 1 var)))
                (while (string-match "\\." varnum start)
                  (setq depth (1+ depth)
***************
*** 470,477 ****
                                                'font-lock-warning-face
                                              nil) depth)
                  (if (and (cadr var-list)
!                          (string-match varnum (cadr (cadr var-list))))
!                     (setq char ?-))
                  (if (string-match "\\*$" (nth 3 var))
                      (speedbar-make-tag-line 'bracket char
                                              'gdb-speedbar-expand-node varnum
--- 470,479 ----
                                                'font-lock-warning-face
                                              nil) depth)
                  (if (and (cadr var-list)
!                          (string-match (concat varnum "\\.")
!                                        (cadr (cadr var-list))))
!                     (setq char ?-)
!                   (setq char ?+))
                  (if (string-match "\\*$" (nth 3 var))
                      (speedbar-make-tag-line 'bracket char
                                              'gdb-speedbar-expand-node varnum
***************
*** 574,579 ****
--- 576,586 ----
      ;; they are found.
      (while (string-match "\n\032\032\\(.*\\)\n" gud-marker-acc)
        (let ((match (match-string 1 gud-marker-acc)))
+ 
+       ;; Pick up stopped annotation if attaching to process.
+       (if (string-equal match "stopped") (setq gdb-active-process t))
+ 
+       ;; Using annotations, switch to gud-gdba-marker-filter.
        (when (string-equal match "prompt")
          (require 'gdb-ui)
          (gdb-prompt nil))
***************
*** 587,592 ****
--- 594,601 ----
         ;; Set the accumulator to the remaining text.
  
         gud-marker-acc (substring gud-marker-acc (match-end 0)))
+ 
+       ;; Pick up any errors that occur before first prompt annotation.
        (if (string-equal match "error-begin")
            (put-text-property 0 (length gud-marker-acc)
                               'face font-lock-warning-face