Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1139

2 files changed, 9 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff45c19947d..125b38a4574 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index d96dc4b7711..45843ec696f 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