Backport from trunk: Fix bug#6298.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f668922cb5cfd5dfc637c2ac030a209565b45926..a8e7f062000bb5ad4a92eeeb7bc6955518b646d6 100644 (file)
--- 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 76345034c6e050216a41a1b076ea2b1e616742c4..4c8199725557f687c3976b48ce642de13ebb9faa 100644 (file)
--- 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.