diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-11-06 11:57:24 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-11-06 11:57:24 +0200 |
| commit | 21620882d7956ac84de26371f9fb504b6c558192 (patch) | |
| tree | 4c3cc00fec2c24b23edfe690600d8c204ddb0f35 | |
| parent | 8468f78b663a9252729e8e77ad85436037977016 (diff) | |
| download | emacs-21620882d7956ac84de26371f9fb504b6c558192.tar.gz | |
Fix bug #7285.
ls-lisp.el (insert-directory): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ls-lisp.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 48bd9c2f8a9..83915ca448d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-11-06 Eli Zaretskii <eliz@gnu.org> + + * ls-lisp.el (insert-directory): Doc fix. (bug#7285) + 2010-11-07 Wilson Snyder <wsnyder@wsnyder.org> * progmodes/verilog-mode.el (verilog-insert-one-definition) diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el index 4435ec9bd1e..28311f81e6c 100644 --- a/lisp/ls-lisp.el +++ b/lisp/ls-lisp.el @@ -219,7 +219,8 @@ The Lisp emulation does not run any external programs or shells. It supports ordinary shell wildcards if `ls-lisp-support-shell-wildcards' is non-nil; otherwise, it interprets wildcards as regular expressions to match file names. It does not support all `ls' switches -- those -that work are: A a c i r S s t u U X g G B C R n and F partly." +that work are: A a B C c F G g h i n R r S s t U u X. The l switch +is assumed to be always present and cannot be turned off." (if ls-lisp-use-insert-directory-program (funcall original-insert-directory file switches wildcard full-directory-p) |