[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100168: Fix bug #7285.

[Eli Zaretskii]

------------------------------------------------------------
revno: 100168
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-23
timestamp: Sat 2010-11-06 11:57:24 +0200
message:
  Fix bug #7285.
  
   ls-lisp.el (insert-directory): Doc fix.
modified:
  lisp/ChangeLog
  lisp/ls-lisp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-06 07:54:19 +0000
+++ b/lisp/ChangeLog    2010-11-06 09:57:24 +0000
@@ -1,3 +1,7 @@
+2010-11-06  Eli Zaretskii  <address@hidden>
+
+       * ls-lisp.el (insert-directory): Doc fix.  (bug#7285)
+
 2010-11-07  Wilson Snyder  <address@hidden>
 
         * progmodes/verilog-mode.el (verilog-insert-one-definition)

=== modified file 'lisp/ls-lisp.el'
--- a/lisp/ls-lisp.el   2010-10-12 23:25:19 +0000
+++ b/lisp/ls-lisp.el   2010-11-06 09:57:24 +0000
@@ -219,7 +219,8 @@
 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)