From 949544ed2686f00430b4ffe75d7b64832dbaa4f9 Mon Sep 17 00:00:00 2001
From: Drew Adams <drew.adams@oracle.com>
Date: Mon, 31 May 2010 17:24:46 +0200
Subject: [PATCH] Backport from trunk: Fix bug#6298.

---
 lisp/ChangeLog | 4 ++++
 lisp/files.el  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

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