[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.42 emacs/lisp/progmodes/gud.el:1.43
*** emacs/lisp/progmodes/gud.el:1.42    Tue Jun 14 21:14:12 2005
--- emacs/lisp/progmodes/gud.el Fri Jun 24 01:31:50 2005
***************
*** 497,514 ****
      ;; Check for annotations and change gud-minor-mode to 'gdba if
      ;; they are found.
      (while (string-match "\n\032\032\\(.*\\)\n" gud-marker-acc)
!       (when (string-equal (match-string 1 gud-marker-acc) "prompt")
!       (require 'gdb-ui)
!       (gdb-prompt nil))
! 
!       (setq
!        ;; Append any text before the marker to the output we're going
!        ;; to return - we don't include the marker in this text.
!        output (concat output
!                     (substring gud-marker-acc 0 (match-beginning 0)))
! 
!        ;; Set the accumulator to the remaining text.
!        gud-marker-acc (substring gud-marker-acc (match-end 0))))
  
      ;; Does the remaining text look like it might end with the
      ;; beginning of another marker?  If it does, then keep it in
--- 497,520 ----
      ;; Check for annotations and change gud-minor-mode to 'gdba if
      ;; they are found.
      (while (string-match "\n\032\032\\(.*\\)\n" gud-marker-acc)
!       (let ((match (match-string 1 gud-marker-acc)))
!       (when (string-equal match "prompt")
!         (require 'gdb-ui)
!         (gdb-prompt nil))
! 
!       (setq
!        ;; Append any text before the marker to the output we're going
!        ;; to return - we don't include the marker in this text.
!        output (concat output
!                       (substring gud-marker-acc 0 (match-beginning 0)))
!        
!        ;; Set the accumulator to the remaining text.
!        
!        gud-marker-acc (substring gud-marker-acc (match-end 0)))
!       (if (string-equal match "error-begin")
!           (put-text-property 0 (length gud-marker-acc)
!                              'face font-lock-warning-face
!                              gud-marker-acc))))
  
      ;; Does the remaining text look like it might end with the
      ;; beginning of another marker?  If it does, then keep it in
***************
*** 3256,3266 ****
    (when gud-tooltip-dereference
      (setq expr (concat "*" expr)))
    (case gud-minor-mode
!     (gdba (concat "server print " expr))
!     ((dbx gdbmi) (concat "print " expr))
!     (xdb (concat "p " expr))
!     (sdb (concat expr "/"))
!     (perldb expr)))
  
  (defun gud-tooltip-tips (event)
    "Show tip for identifier or selection under the mouse.
--- 3262,3272 ----
    (when gud-tooltip-dereference
      (setq expr (concat "*" expr)))
    (case gud-minor-mode
!       (gdba (concat "server print " expr))
!       ((dbx gdbmi) (concat "print " expr))
!       (xdb (concat "p " expr))
!       (sdb (concat expr "/"))
!       (perldb expr)))
  
  (defun gud-tooltip-tips (event)
    "Show tip for identifier or selection under the mouse.