[Emacs-diffs] Changes to emacs/lisp/progmodes/gdb-ui.el, v [EMACS_22_BASE]

[Nick Roberts]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Nick Roberts <nickrob>  08/04/28 03:24:43

Index: gdb-ui.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/gdb-ui.el,v
retrieving revision 1.206.2.24
retrieving revision 1.206.2.25
diff -u -b -r1.206.2.24 -r1.206.2.25
--- gdb-ui.el   12 Apr 2008 13:13:32 -0000      1.206.2.24
+++ gdb-ui.el   28 Apr 2008 03:24:43 -0000      1.206.2.25
@@ -1927,12 +1927,11 @@
                   '(face font-lock-type-face)))
                (let ((bl (point))
                      (el (line-end-position)))
-                 (if (re-search-forward " in \\(.*\\) at\\s-+" el t)
-                     (progn
+                 (when (re-search-forward " in \\(.*\\) at" el t)
                        (add-text-properties
                         (match-beginning 1) (match-end 1)
-                        '(face font-lock-function-name-face))
-                       (looking-at "\\(\\S-+\\):\\([0-9]+\\)")
+                    '(face font-lock-function-name-face)))
+                 (if (re-search-forward ".*\\s-+\\(\\S-+\\):\\([0-9]+\\)$")
                        (let ((line (match-string 2))
                              (file (match-string 1)))
                          (add-text-properties bl el
@@ -2131,7 +2130,7 @@
   (if event (posn-set-point (event-end event)))
   (save-excursion
     (beginning-of-line 1)
-    (if (looking-at "\\([0-9]+\\.?[0-9]*\\) .+ in .+ 
at\\s-+\\(\\S-+\\):\\([0-9]+\\)")
+    (if (looking-at "\\([0-9]+\\.?[0-9]*\\) .*\\s-+\\(\\S-+\\):\\([0-9]+\\)$")
        (let ((bptno (match-string 1))
              (file  (match-string 2))
              (line  (match-string 3)))
@@ -2148,7 +2147,7 @@
       (error "No location specified."))))
 
 
-;; Frames buffer.  This displays a perpetually correct bactracktrace
+;; Frames buffer.  This displays a perpetually correct backtrace
 ;; (from the command `where').
 ;;
 ;; Alas, if your stack is deep, it is costly.
@@ -3337,7 +3336,7 @@
          (with-current-buffer buffer
            (save-excursion
              (goto-char (point-min))
-             (if (search-forward address nil t)
+             (if (re-search-forward (concat "^0x0*" address) nil t)
                  (gdb-put-breakpoint-icon (eq flag ?y) bptno)))))))
     (if (not (equal gdb-pc-address "main"))
        (with-current-buffer buffer