From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 29 Apr 1998 05:06:46 +0000 (+0000)
Subject: (dired-sort-toggle): Handle spaces in dired-actual-switches.
X-Git-Tag: emacs-20.3~1244
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7820b28f318a34ba4bf9e6adb316a6ba31f14e77;p=emacs.git

(dired-sort-toggle): Handle spaces in dired-actual-switches.
---

diff --git a/lisp/dired.el b/lisp/dired.el
index c8f6c6de60e..d6168e5f290 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2389,16 +2389,22 @@ With a prefix argument you can edit the current listing switches instead."
   ;; Toggle between sort by date/name.  Reverts the buffer.
   (setq dired-actual-switches
 	(let (case-fold-search)
-	  (concat
-	   "-l"
-	   (dired-replace-in-string (concat "[-lt"
-					    dired-ls-sorting-switches "]")
-				    ""
-				    dired-actual-switches)
-	   (if (string-match (concat "[t" dired-ls-sorting-switches "]")
-			     dired-actual-switches)
-	       ""
-	     "t"))))
+	  (if (string-match " " dired-actual-switches)
+	      ;; New toggle scheme: add/remove a trailing " -t"
+	      (if (string-match " -t\\'" dired-actual-switches)
+		  (dired-replace-in-string " -t\\'" "" dired-actual-switches)
+		(concat dired-actual-switches " -t"))
+	    ;; old toggle scheme: look for some 't' switch and add/remove it
+	    (concat
+	     "-l"
+	     (dired-replace-in-string (concat "[-lt"
+					      dired-ls-sorting-switches "]")
+				      ""
+				      dired-actual-switches)
+	     (if (string-match (concat "[t" dired-ls-sorting-switches "]")
+			       dired-actual-switches)
+		 ""
+	       "t")))))
   (dired-sort-set-modeline)
   (revert-buffer))