Mercurial > emacs
changeset 94555:e33c27238da2
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1139
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 02 May 2008 12:43:30 +0000 |
| parents | 24dae001519e (current diff) c147a137d94d (diff) |
| children | 8d02ae7cb729 |
| files | lisp/ChangeLog lisp/progmodes/gdb-ui.el |
| diffstat | 2 files changed, 9 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri May 02 12:12:44 2008 +0000 +++ b/lisp/ChangeLog Fri May 02 12:43:30 2008 +0000 @@ -1,3 +1,8 @@ +2008-05-02 Nick Roberts <nickrob@snap.net.nz> + + * progmodes/gdb-ui.el (gdb-info-breakpoints-custom): Don't + throw error if no file is found. + 2008-05-02 Juanma Barranquero <lekktu@gmail.com> * vc-hooks.el (vc-call, vc-state): Fix typos in docstrings.
--- a/lisp/progmodes/gdb-ui.el Fri May 02 12:12:44 2008 +0000 +++ b/lisp/progmodes/gdb-ui.el Fri May 02 12:43:30 2008 +0000 @@ -1950,12 +1950,13 @@ (add-text-properties (match-beginning 1) (match-end 1) '(face font-lock-function-name-face))) - (if (re-search-forward ".*\\s-+\\(\\S-+\\):\\([0-9]+\\)$") + (if (re-search-forward + ".*\\s-+\\(\\S-+\\):\\([0-9]+\\)$" nil t) (let ((line (match-string 2)) (file (match-string 1))) (add-text-properties bl el - '(mouse-face highlight - help-echo "mouse-2, RET: visit breakpoint")) + '(mouse-face highlight + help-echo "mouse-2, RET: visit breakpoint")) (unless (file-exists-p file) (setq file (cdr (assoc bptno gdb-location-alist)))) (if (and file