[Emacs-diffs] /srv/bzr/emacs/trunk r105725: -o doesn't exist on *BSD, so don't mention it

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105725
fixes bug(s): http://debbugs.gnu.org/9301
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-11 16:54:49 +0200
message:
  -o doesn't exist on *BSD, so don't mention it
modified:
  lisp/ChangeLog
  lisp/dired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-11 04:28:07 +0000
+++ b/lisp/ChangeLog    2011-09-11 14:54:49 +0000
@@ -1,5 +1,8 @@
 2011-09-11  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2011-09-11 02:29:23 +0000
+++ b/lisp/dired.el     2011-09-11 14:54:49 +0000
@@ -3413,7 +3413,8 @@
     (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 ()