diff options
| author | Miles Bader <[email protected]> | 2008-05-02 12:43:30 +0000 |
|---|---|---|
| committer | Miles Bader <[email protected]> | 2008-05-02 12:43:30 +0000 |
| commit | bfab7c6ec74dc55d640ef36f8cb1790a1420f991 (patch) | |
| tree | 7fdb5a4e86c08ef89712061e002a100af4f383cd /lisp | |
| parent | 3a23a519591b06980f79db48f5bf5e0d34451211 (diff) | |
| parent | 50eff40ff15b6349137bc9618d021495c72815af (diff) | |
Merge from emacs--rel--22
Revision: [email protected]/emacs--devo--0--patch-1139
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/gdb-ui.el | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ff45c19947..125b38a457 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-05-02 Nick Roberts <[email protected]> + + * progmodes/gdb-ui.el (gdb-info-breakpoints-custom): Don't + throw error if no file is found. + 2008-05-02 Juanma Barranquero <[email protected]> * vc-hooks.el (vc-call, vc-state): Fix typos in docstrings. diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index d96dc4b771..45843ec696 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -1950,12 +1950,13 @@ static char *magick[] = { (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 |