aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2011-09-11 16:54:49 +0200
committerLars Magne Ingebrigtsen2011-09-11 16:54:49 +0200
commit39d7fed67b49dbc705328dbec87c8d01b6f60349 (patch)
treebb0ba7ad7c6b2c7d6a03dbf91a72c96eea770a1f
parent9d1d6e68a4fa428c672f870bb8a363de90bf05ce (diff)
downloademacs-39d7fed67b49dbc705328dbec87c8d01b6f60349.tar.gz
emacs-39d7fed67b49dbc705328dbec87c8d01b6f60349.zip
-o doesn't exist on *BSD, so don't mention it
Fixes: debbugs:9301
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/dired.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34d298fdba3..fdb27efaa0f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> 12011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * dired.el (dired-sort-toggle-or-edit): -o doesn't exist on *BSD,
4 so don't mention it (bug#9301).
5
3 * faces.el (face-spec-set-match-display): Make `(type graphic)' 6 * faces.el (face-spec-set-match-display): Make `(type graphic)'
4 match `x', `w32' and `ns', like the manual says (bug#9029). 7 match `x', `w32' and `ns', like the manual says (bug#9029).
5 8
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."
3413 (error "Cannot sort this dired buffer")) 3413 (error "Cannot sort this dired buffer"))
3414 (if arg 3414 (if arg
3415 (dired-sort-other 3415 (dired-sort-other
3416 (read-string "ls switches (must contain -l, -o, or -g): " dired-actual-switches)) 3416 (read-string "ls switches (must contain -l or -g): "
3417 dired-actual-switches))
3417 (dired-sort-toggle))) 3418 (dired-sort-toggle)))
3418 3419
3419(defun dired-sort-toggle () 3420(defun dired-sort-toggle ()