From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Sun, 11 Sep 2011 14:54:49 +0000 (+0200)
Subject: -o doesn't exist on *BSD, so don't mention it
X-Git-Tag: emacs-pretest-24.0.90~104^2~93
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=39d7fed67b49dbc705328dbec87c8d01b6f60349;p=emacs.git

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

Fixes: debbugs:9301
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34d298fdba3..fdb27efaa0f 100644
--- 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 442a792a196..c6eb5f1af68 100644
--- 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 ()