diff options
| author | Drew Adams | 2010-05-31 17:24:46 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-05-31 17:24:46 +0200 |
| commit | 949544ed2686f00430b4ffe75d7b64832dbaa4f9 (patch) | |
| tree | d9d63fb7632e1f0a67f4135ef54c455e1df36548 | |
| parent | 450439d5b6c08f0001f6676a697f29d88f587b98 (diff) | |
| download | emacs-949544ed2686f00430b4ffe75d7b64832dbaa4f9.tar.gz emacs-949544ed2686f00430b4ffe75d7b64832dbaa4f9.zip | |
Backport from trunk: Fix bug#6298.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/files.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f668922cb5c..a8e7f062000 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-05-31 Drew Adams <drew.adams@oracle.com> | ||
| 2 | |||
| 3 | * files.el (directory-files-no-dot-files-regexp): Doc fix (bug#6298). | ||
| 4 | |||
| 1 | 2010-05-31 Juanma Barranquero <lekktu@gmail.com> | 5 | 2010-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 76345034c6e..4c819972555 100644 --- a/lisp/files.el +++ b/lisp/files.el | |||
| @@ -4647,7 +4647,7 @@ this happens by default." | |||
| 4647 | 4647 | ||
| 4648 | (defconst directory-files-no-dot-files-regexp | 4648 | (defconst directory-files-no-dot-files-regexp |
| 4649 | "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*" | 4649 | "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*" |
| 4650 | "Regexp of file names excluging \".\" an \"..\".") | 4650 | "Regexp matching any file name except \".\" and \"..\".") |
| 4651 | 4651 | ||
| 4652 | (defun delete-directory (directory &optional recursive) | 4652 | (defun delete-directory (directory &optional recursive) |
| 4653 | "Delete the directory named DIRECTORY. Does not follow symlinks. | 4653 | "Delete the directory named DIRECTORY. Does not follow symlinks. |