Backport from trunk: Fix bug#6298.

949544ed · Drew Adams · Juanma Barranquero · 450439d5 · 949544ed · 949544ed
Commit 949544ed authored May 31, 2010 by Drew Adams Committed by Juanma Barranquero May 31, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/files.el lisp/files.el +1 -1

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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

--- 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.