[Emacs-diffs] /srv/bzr/emacs/trunk r103512: recentf.el fix for bug#5843.

[Glenn Morris]

------------------------------------------------------------
revno: 103512
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-03-04 00:14:57 -0800
message:
  recentf.el fix for bug#5843.
  
  * lisp/recentf.el (recentf-include-p): In case of a buggy predicate,
  err on the side of including, not excluding.
modified:
  lisp/ChangeLog
  lisp/recentf.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-04 08:01:24 +0000
+++ b/lisp/ChangeLog    2011-03-04 08:14:57 +0000
@@ -1,3 +1,8 @@
+2011-03-04  Glenn Morris  <address@hidden>
+
+       * recentf.el (recentf-include-p): In case of a buggy predicate,
+       err on the side of including, not excluding.  (Bug#5843)
+
 2011-03-04  Jay Belanger  <address@hidden>
 
        * calc/calc-units.el (math-to-standard-rec): Don't treat subscripted

=== modified file 'lisp/recentf.el'
--- a/lisp/recentf.el   2011-01-25 04:08:28 +0000
+++ b/lisp/recentf.el   2011-03-04 08:14:57 +0000
@@ -411,13 +411,14 @@
         (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))