diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-03 03:48:07 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-03 03:48:07 +0200 |
| commit | 28fd8759b38d18235e268709d27dd0d2c4ae45cc (patch) | |
| tree | 4fe0c59bc32ed9890a52683ea1c224038c2d0fc2 /lisp | |
| parent | 0dd8b6da56db8f711b2707f9fd5340fbe4615355 (diff) | |
| download | emacs-28fd8759b38d18235e268709d27dd0d2c4ae45cc.tar.gz emacs-28fd8759b38d18235e268709d27dd0d2c4ae45cc.tar.bz2 emacs-28fd8759b38d18235e268709d27dd0d2c4ae45cc.zip | |
* files.el (file-expand-wildcards): Ignore non-readable
sub-directories while trying to find matches instead of signalling
an error (bug#6297).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 112d7faacb0..62458723ac9 100644 --- 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 c2c2eae9d05..3cc41b04b4e 100644 --- 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 |