* lisp/dired.el (dired-sort-toggle-or-edit): Revert last changes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa90a2f1b4a9b13272a67876c82f4d9f316a42b8..7a493676add9226d0d1cba45d8b28b6cf5a35d05 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * dired.el (dired-sort-toggle-or-edit): Revert last changes.
+
 2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * dired.el (dired-sort-toggle-or-edit): -o doesn't exist on *BSD,

diff --git a/lisp/dired.el b/lisp/dired.el
index 679a32734e72d88a1ea9f75e9956bf90c1f88e36..ecb626a275e466df31bb844025a44870cadc6d71 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3413,8 +3413,7 @@ 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 or similar): "
-                   dired-actual-switches))
+       (read-string "ls switches (must contain -l): " dired-actual-switches))
     (dired-sort-toggle)))
 
 (defun dired-sort-toggle ()