From 190def626e1f80076ee355c4fd02d107f1252424 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Sat, 29 Jan 2005 06:55:14 +0000 Subject: [PATCH] (gdb-info-breakpoints-custom) (gdb-goto-breakpoint): Make breakpoint handling work on template functions in C++. Reported by Martin Reed (gdb-assembler-custom): Update to recognise breakpoint information added on 2005-01-19. --- lisp/progmodes/gdb-ui.el | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index a89f4b1694f..2769023605e 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -1902,7 +1902,7 @@ BUFFER nil or omitted means use the current buffer." (defun gdb-assembler-custom () (let ((buffer (gdb-get-buffer 'gdb-assembler-buffer)) - (pos 1) (address) (flag)) + (pos 1) (address) (flag) (bptno)) (with-current-buffer buffer (if (not (equal gdb-current-address "main")) (progn @@ -1924,16 +1924,17 @@ BUFFER nil or omitted means use the current buffer." (if (looking-at "[^\t].*breakpoint") (progn (looking-at - "[0-9]*\\s-*\\S-*\\s-*\\S-*\\s-*\\(.\\)\\s-*0x\\(\\S-*\\)") - (setq flag (char-after (match-beginning 1))) - (setq address (match-string 2)) + "\\([0-9]+\\)\\s-+\\S-+\\s-+\\S-+\\s-+\\(.\\)\\s-+0x\\(\\S-+\\)") + (setq bptno (match-string 1)) + (setq flag (char-after (match-beginning 2))) + (setq address (match-string 3)) ;; remove leading 0s from output of info break. (if (string-match "^0+\\(.*\\)" address) (setq address (match-string 1 address))) (with-current-buffer buffer (goto-char (point-min)) (if (re-search-forward address nil t) - (gdb-put-breakpoint-icon (eq flag ?y)))))))) + (gdb-put-breakpoint-icon (eq flag ?y) bptno))))))) (if (not (equal gdb-current-address "main")) (set-window-point (get-buffer-window buffer 0) pos)))) -- 2.39.2