[Emacs-diffs] /srv/bzr/emacs/trunk r104899: * files.el (file-expand-wildcards): Ignore non-readable

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104899
fixes bug(s): http://debbugs.gnu.org/6297
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2011-07-03 03:48:07 +0200
message:
  * files.el (file-expand-wildcards): Ignore non-readable
  sub-directories while trying to find matches instead of signalling
  an error (bug#6297).
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-03 01:35:35 +0000
+++ b/lisp/ChangeLog    2011-07-03 01:48:07 +0000
@@ -1,5 +1,9 @@
 2011-07-03  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2011-06-30 01:39:52 +0000
+++ b/lisp/files.el     2011-07-03 01:48:07 +0000
@@ -5560,7 +5560,8 @@
           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