diff options
| author | Drew Adams <drew.adams@oracle.com> | 2010-05-31 17:24:46 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2010-05-31 17:24:46 +0200 |
| commit | 949544ed2686f00430b4ffe75d7b64832dbaa4f9 (patch) | |
| tree | d9d63fb7632e1f0a67f4135ef54c455e1df36548 /lisp | |
| parent | 450439d5b6c08f0001f6676a697f29d88f587b98 (diff) | |
| download | emacs-949544ed2686f00430b4ffe75d7b64832dbaa4f9.tar.gz | |
Backport from trunk: Fix bug#6298.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f668922cb5c..a8e7f062000 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-05-31 Drew Adams <drew.adams@oracle.com> + + * files.el (directory-files-no-dot-files-regexp): Doc fix (bug#6298). + 2010-05-31 Juanma Barranquero <lekktu@gmail.com> * subr.el (momentary-string-display): Just use read-event to read diff --git a/lisp/files.el b/lisp/files.el index 76345034c6e..4c819972555 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4647,7 +4647,7 @@ this happens by default." (defconst directory-files-no-dot-files-regexp "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*" - "Regexp of file names excluging \".\" an \"..\".") + "Regexp matching any file name except \".\" and \"..\".") (defun delete-directory (directory &optional recursive) "Delete the directory named DIRECTORY. Does not follow symlinks. |