(insert-directory): Remove --dired switch when

`ls-lisp-use-insert-directory-program' is nil.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37bdc38be65643f60002bb365cf09e261c739cfd..dd1270ab51b801941feb7c0ffb822776738f650e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-14  John Paul Wallington  <jpw@gnu.org>
+
+       * ls-lisp.el (insert-directory): Remove --dired switch when
+       `ls-lisp-use-insert-directory-program' is nil.
+
 2003-05-13  Stefan Monnier  <monnier@cs.yale.edu>
 
        * textmodes/ispell.el (xemacsp): Remove.  Use (featurep 'xemacs).

diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 54c76a9d725326cbf5af4653d5924048bbbea9e9..b6621b08566fb22f46f159817b7506bdbc617238 100644 (file)
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -216,6 +216,9 @@ that work are: A a c i r S s t u U X g G B C R and F partly."
       (if handler
          (funcall handler 'insert-directory file switches
                   wildcard full-directory-p)
+       ;; Remove --dired switch
+       (if (string-match "--dired " switches)
+           (setq switches (replace-match "" nil nil switches)))
        ;; Convert SWITCHES to a list of characters.
        (setq switches (delete ?- (append switches nil)))
        (if wildcard