* files.el (file-expand-wildcards): Ignore non-readable

sub-directories while trying to find matches instead of signalling
an error (bug#6297).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 112d7faacb070131d56801d44b1218fbc3b41240..62458723ac933bbf4f7c2a3f1f176a8fdb5cb842 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * files.el (file-expand-wildcards): Ignore non-readable
+       sub-directories while trying to find matches instead of signalling
+       an error (bug#6297).
+
        * man.el (Man-reference-regexp): Allow matching possible
        word-wrapped references (bug#6289).
 

diff --git a/lisp/files.el b/lisp/files.el
index c2c2eae9d05ae45232d9c5aecfc708e9295a6aa2..3cc41b04b4ec7c9e8c232140c76416bb047364c3 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5560,7 +5560,8 @@ default directory.  However, if FULL is non-nil, they are absolute."
           contents)
       (while dirs
        (when (or (null (car dirs))     ; Possible if DIRPART is not wild.
-                 (file-directory-p (directory-file-name (car dirs))))
+                 (and (file-directory-p (directory-file-name (car dirs)))
+                      (file-readable-p (car dirs))))
          (let ((this-dir-contents
                 ;; Filter out "." and ".."
                 (delq nil