# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1275319486 -7200
# Node ID 3a80fc3735bf62af5f4fd20e55f319bf4595b3f4
# Parent  e3df298f4131de7727dfe1843970a258e38bfd8b
Backport from trunk: Fix bug#6298.

diff -r e3df298f4131 -r 3a80fc3735bf lisp/ChangeLog
--- a/lisp/ChangeLog	Mon May 31 10:11:18 2010 -0400
+++ b/lisp/ChangeLog	Mon May 31 17:24:46 2010 +0200
@@ -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 -r e3df298f4131 -r 3a80fc3735bf lisp/files.el
--- a/lisp/files.el	Mon May 31 10:11:18 2010 -0400
+++ b/lisp/files.el	Mon May 31 17:24:46 2010 +0200
@@ -4647,7 +4647,7 @@
 
 (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.