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

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/04/29 01:03:45

Index: progmodes/gdb-ui.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/progmodes/gdb-ui.el,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -b -r1.241 -r1.242
--- progmodes/gdb-ui.el 29 Apr 2008 00:41:23 -0000      1.241
+++ progmodes/gdb-ui.el 29 Apr 2008 01:03:42 -0000      1.242
@@ -1944,12 +1944,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
@@ -1975,7 +1974,7 @@
                            (gdb-enqueue-input
                             (list (concat gdb-server-prefix "info source\n")
                                   `(lambda () (gdb-get-location
-                                               ,bptno ,line ,flag)))))))
+                                               ,bptno ,line ,flag))))))
                    (if (re-search-forward
                         "<\\(\\(\\sw\\|[_.]\\)+\\)\\(\\+[0-9]+\\)?>"
                         el t)
@@ -2201,7 +2200,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)))
@@ -2218,7 +2217,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.
@@ -3475,7 +3474,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