Mercurial > emacs

changeset 74969:3b49658358de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(dired-sort-other): Move test for dired-mode... (dired-sort-set-modeline): ...to here.
author Nick Roberts <nickrob@snap.net.nz>
date Fri, 29 Dec 2006 23:57:38 +0000
parents 8ad08e091b07
children d278931df0dd
files lisp/dired.el
diffstat 1 files changed, 13 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/dired.el	Fri Dec 29 23:56:44 2006 +0000
+++ b/lisp/dired.el	Fri Dec 29 23:57:38 2006 +0000
@@ -3098,15 +3098,18 @@
   ;; Modeline display of "by name" or "by date" guarantees the user a
   ;; match with the corresponding regexps.  Non-matching switches are
   ;; shown literally.
-  (setq mode-name
-	(let (case-fold-search)
-	  (cond ((string-match dired-sort-by-name-regexp dired-actual-switches)
-		 "Dired by name")
-		((string-match dired-sort-by-date-regexp dired-actual-switches)
-		 "Dired by date")
-		(t
-		 (concat "Dired " dired-actual-switches)))))
-  (force-mode-line-update))
+  (when (eq major-mode 'dired-mode)
+    (setq mode-name
+	  (let (case-fold-search)
+	    (cond ((string-match 
+		    dired-sort-by-name-regexp dired-actual-switches)
+		   "Dired by name")
+		  ((string-match
+		    dired-sort-by-date-regexp dired-actual-switches)
+		   "Dired by date")
+		  (t
+		   (concat "Dired " dired-actual-switches)))))
+    (force-mode-line-update)))
 
 (defun dired-sort-toggle-or-edit (&optional arg)
   "Toggle between sort by date/name and refresh the dired buffer.
@@ -3162,7 +3165,7 @@
 With optional second arg NO-REVERT, don't refresh the listing afterwards."
   (dired-sort-R-check switches)
   (setq dired-actual-switches switches)
-  (if (eq major-mode 'dired-mode) (dired-sort-set-modeline))
+  (dired-sort-set-modeline)
   (or no-revert (revert-buffer)))
 
 (defvar dired-subdir-alist-pre-R nil