-o doesn't exist on *BSD, so don't mention it

Fixes: debbugs:9301

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34d298fdba3bcd5b10a705dedc1dd2718ec8990b..fdb27efaa0f5d2a6a61a54a7868eff85b65cb727 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * dired.el (dired-sort-toggle-or-edit): -o doesn't exist on *BSD,
+       so don't mention it (bug#9301).
+
        * faces.el (face-spec-set-match-display): Make `(type graphic)'
        match `x', `w32' and `ns', like the manual says (bug#9029).
 

diff --git a/lisp/dired.el b/lisp/dired.el
index 442a792a196a133fc348ce94c5e5d48cd9c67539..c6eb5f1af685972f2832cf5b219370ad45bbd35d 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3413,7 +3413,8 @@ With a prefix argument, edit the current listing switches instead."
     (error "Cannot sort this dired buffer"))
   (if arg
       (dired-sort-other
-       (read-string "ls switches (must contain -l, -o, or -g): " dired-actual-switches))
+       (read-string "ls switches (must contain -l or -g): "
+                   dired-actual-switches))
     (dired-sort-toggle)))
 
 (defun dired-sort-toggle ()