(gud-tooltip-print-command): Indent properly.

(gud-gdb-marker-filter): Use font-lock-warning-face for any
initial error.

1 files changed, 23 insertions, 17 deletions

diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 7d4fc00cd56..c6e85934db4 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -497,18 +497,24 @@ off the specialized speedbar mode."
     ;; 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))))
+      (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,11 +3262,11 @@ If GUD-TOOLTIP-DEREFERENCE is t, also prepend a `*' to EXPR."
   (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)))
+        (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.