summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/ls-lisp.el3
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37bdc38be65..dd1270ab51b 100644
--- 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 54c76a9d725..b6621b08566 100644
--- 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