From: Drew Adams Date: Mon, 31 May 2010 15:24:46 +0000 (+0200) Subject: Backport from trunk: Fix bug#6298. X-Git-Tag: emacs-pretest-23.2.90~139^2~159 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=949544ed2686f00430b4ffe75d7b64832dbaa4f9;p=emacs.git Backport from trunk: Fix bug#6298. --- 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 + + * files.el (directory-files-no-dot-files-regexp): Doc fix (bug#6298). + 2010-05-31 Juanma Barranquero * 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.