From: Eli Zaretskii Date: Sat, 6 Nov 2010 09:57:24 +0000 (+0200) Subject: Fix bug #7285. X-Git-Tag: emacs-pretest-23.2.90~12 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=21620882d7956ac84de26371f9fb504b6c558192;p=emacs.git Fix bug #7285. ls-lisp.el (insert-directory): Doc fix. --- 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 + + * ls-lisp.el (insert-directory): Doc fix. (bug#7285) + 2010-11-07 Wilson Snyder * 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)