Merge from mainline.

[gnu-emacs] / lisp / recentf.el

diff --git a/lisp/recentf.el b/lisp/recentf.el
index d0be69b51fc9d30fc8a2c218fc241d482ff3c7a5..9f9baad8dbdce7802cdcb986966cdbfc7e76ddb1 100644 (file)
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -411,13 +411,14 @@ That is, if it doesn't match any of the `recentf-exclude' checks."
         (checks recentf-exclude)
         (keepit t))
     (while (and checks keepit)
-      (setq keepit (condition-case nil
-                       (not (if (stringp (car checks))
-                                ;; A regexp
-                                (string-match (car checks) filename)
-                              ;; A predicate
-                              (funcall (car checks) filename)))
-                     (error nil))
+      ;; If there was an error in a predicate, err on the side of
+      ;; keeping the file.  (Bug#5843)
+      (setq keepit (not (ignore-errors
+                          (if (stringp (car checks))
+                              ;; A regexp
+                              (string-match (car checks) filename)
+                            ;; A predicate
+                            (funcall (car checks) filename))))
             checks (cdr checks)))
     keepit))