(gdb-fringe-width): New variable.

(gdb-ann3): Set it.
(gdb-put-breakpoint-icon): Don't take fringe-width from speedbar
frame.
(gdb-info-frames-custom): Use inverse-video for first five
characters of selected frame only.
(gdb-get-frame-number): Select frame even when point is on frame
number.

diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index d514580c05136f478327221965be21d199df2de5..5ab5eb71abb5adc2f831cabd7eeef6012b4c3c55 100644 (file)
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1547,20 +1547,23 @@ static char *magick[] = {
                               help-echo "mouse-2, RET: Select frame"))
          (goto-char bl)
          (when (looking-at "^#\\([0-9]+\\)")
-           (if (equal (match-string 1) gdb-frame-number)
-               (put-text-property bl el 'face '(:inverse-video t))
-             (when (re-search-forward " in \\([^ ]+\\) (" el t)
+           (when (string-equal (match-string 1) gdb-frame-number)
+               (put-text-property bl (+ bl 4)
+                                  'face '(:inverse-video t)))
+           (when (re-search-forward
+                  (concat
+                   (if (string-equal (match-string 1) "0") "" " in ")
+                   "\\([^ ]+\\) (") el t)
+             (put-text-property (match-beginning 1) (match-end 1)
+                                'face font-lock-function-name-face)
+             (setq bl (match-end 0))
+             (while (re-search-forward "<\\([^>]+\\)>" el t)
                (put-text-property (match-beginning 1) (match-end 1)
-                                  'face font-lock-function-name-face)
-               (setq bl (match-end 0))
-               (while (re-search-forward "<\\([^>]+\\)>" el t)
-                 (put-text-property (match-beginning 1) (match-end 1)
                                     'face font-lock-function-name-face))
-               (goto-char bl)
-               (while (re-search-forward "\\(\\(\\sw\\|[_.]\\)+\\)=" el t)
-                 (put-text-property (match-beginning 1) (match-end 1)
-                                    'face font-lock-variable-name-face))
-               )))
+             (goto-char bl)
+             (while (re-search-forward "\\(\\(\\sw\\|[_.]\\)+\\)=" el t)
+               (put-text-property (match-beginning 1) (match-end 1)
+                                  'face font-lock-variable-name-face))))
          (forward-line 1))))))
 
 (defun gdb-stack-buffer-name ()
@@ -1606,6 +1609,7 @@ static char *magick[] = {
 
 (defun gdb-get-frame-number ()
   (save-excursion
+    (end-of-line)
     (let* ((pos (re-search-backward "^#*\\([0-9]*\\)" nil t))
           (n (or (and pos (match-string-no-properties 1)) "0")))
       n)))