diff options
| author | Lars Magne Ingebrigtsen | 2011-07-03 03:48:07 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-03 03:48:07 +0200 |
| commit | 28fd8759b38d18235e268709d27dd0d2c4ae45cc (patch) | |
| tree | 4fe0c59bc32ed9890a52683ea1c224038c2d0fc2 | |
| parent | 0dd8b6da56db8f711b2707f9fd5340fbe4615355 (diff) | |
| download | emacs-28fd8759b38d18235e268709d27dd0d2c4ae45cc.tar.gz 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).
| -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 @@ | |||
| 1 | 2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-07-03 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * files.el (file-expand-wildcards): Ignore non-readable | ||
| 4 | sub-directories while trying to find matches instead of signalling | ||
| 5 | an error (bug#6297). | ||
| 6 | |||
| 3 | * man.el (Man-reference-regexp): Allow matching possible | 7 | * man.el (Man-reference-regexp): Allow matching possible |
| 4 | word-wrapped references (bug#6289). | 8 | word-wrapped references (bug#6289). |
| 5 | 9 | ||
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." | |||
| 5560 | contents) | 5560 | contents) |
| 5561 | (while dirs | 5561 | (while dirs |
| 5562 | (when (or (null (car dirs)) ; Possible if DIRPART is not wild. | 5562 | (when (or (null (car dirs)) ; Possible if DIRPART is not wild. |
| 5563 | (file-directory-p (directory-file-name (car dirs)))) | 5563 | (and (file-directory-p (directory-file-name (car dirs))) |
| 5564 | (file-readable-p (car dirs)))) | ||
| 5564 | (let ((this-dir-contents | 5565 | (let ((this-dir-contents |
| 5565 | ;; Filter out "." and ".." | 5566 | ;; Filter out "." and ".." |
| 5566 | (delq nil | 5567 | (delq nil |