aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDrew Adams2010-05-31 17:15:20 +0200
committerJuanma Barranquero2010-05-31 17:15:20 +0200
commit1603358c07968d47cd48da509bfe5b2230505493 (patch)
treeb11e14d4edc086839f11b0b925af9ce62b45e799
parentfe40dc63a6997a2dfb05e67efe21012247361f60 (diff)
downloademacs-1603358c07968d47cd48da509bfe5b2230505493.tar.gz
emacs-1603358c07968d47cd48da509bfe5b2230505493.zip
* files.el (directory-files-no-dot-files-regexp): Doc fix (bug#6298).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/files.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5065ff98f36..b8b1fee8e0c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-05-31 Drew Adams <drew.adams@oracle.com>
2
3 * files.el (directory-files-no-dot-files-regexp): Doc fix (bug#6298).
4
12010-05-31 Juanma Barranquero <lekktu@gmail.com> 52010-05-31 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * subr.el (momentary-string-display): Just use read-event to read 7 * subr.el (momentary-string-display): Just use read-event to read
diff --git a/lisp/files.el b/lisp/files.el
index 4ab583d018b..8d30659732f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4673,7 +4673,7 @@ this happens by default."
4673 4673
4674(defconst directory-files-no-dot-files-regexp 4674(defconst directory-files-no-dot-files-regexp
4675 "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*" 4675 "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"
4676 "Regexp of file names excluging \".\" an \"..\".") 4676 "Regexp matching any file name except \".\" and \"..\".")
4677 4677
4678(defun delete-directory (directory &optional recursive trash) 4678(defun delete-directory (directory &optional recursive trash)
4679 "Delete the directory named DIRECTORY. Does not follow symlinks. 4679 "Delete the directory named DIRECTORY. Does not follow symlinks.