X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-fldmgr.el;h=993fb780dae98cc53850ccea5869758ed857360a;hb=709366cf00291239e4287abb0b2105ad47fdbf59;hp=197528543533f41609981e4e456f7cc82629d1a3;hpb=8f69384e4b4dc241a3990d49b9f2674eb0b717b6;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index 1975285..993fb78 100644
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -925,7 +925,7 @@ return value is diffs '(-new -unread -all)."
 	      (progn
 		(wl-folder-open-close)
 		(wl-folder-jump-to-current-entity t)
-		(message (format "%s is renamed to %s" new-folder old-folder))
+		(message "%s is renamed to %s" old-folder new-folder)
 		(sit-for 1))
 	    ;; update folder list
 	    (when (wl-fldmgr-cut tmp nil t)
@@ -1015,21 +1015,28 @@ return value is diffs '(-new -unread -all)."
   (interactive)
   (save-excursion
     (beginning-of-line)
-    (if (looking-at wl-folder-group-regexp)
-	(message "This folder is group")
-      (let ((tmp (wl-fldmgr-get-path-from-buffer))
-	    entity)
-	(if (eq (cdr (nth 2 tmp)) 'access)
-	    (message "Can't change access group")
-	  (setq entity (nth 4 tmp))
-	  (unless entity (error "No folder"))
-	  (wl-fldmgr-add (concat "/"
-				 (elmo-read-search-condition
-				  wl-fldmgr-make-filter-default)
-				 "/" entity)))))))
-
-(defun wl-fldmgr-sort ()
-  (interactive)
+    (let ((tmp (wl-fldmgr-get-path-from-buffer))
+	  entity)
+      (if (eq (cdr (nth 2 tmp)) 'access)
+	  (message "Can't change access group")
+	(if (wl-folder-buffer-group-p)
+	    (setq entity
+		  (concat
+		   "*"
+		   (mapconcat 'identity
+			      (wl-folder-get-entity-list
+			       (wl-folder-search-group-entity-by-name
+				(nth 4 tmp)
+				wl-folder-entity)) ",")))
+	  (setq entity (nth 4 tmp)))
+	(unless entity (error "No folder"))
+	(wl-fldmgr-add (concat "/"
+			       (elmo-read-search-condition
+				wl-fldmgr-make-filter-default)
+			       "/" entity))))))
+
+(defun wl-fldmgr-sort (&optional arg)
+  (interactive "P")
   (save-excursion
     (beginning-of-line)
     (let ((inhibit-read-only t)
@@ -1042,10 +1049,10 @@ return value is diffs '(-new -unread -all)."
 		      wl-folder-entity))
 	(message "Sorting...")
 	(setq flist (sort (nth 2 entity) wl-fldmgr-sort-function))
+	(when arg (setq flist (nreverse flist)))
 	(setcar (cddr entity) flist)
 	(wl-fldmgr-add-modified-access-list (car entity))
 	(setq wl-fldmgr-modified t)
-	;;
 	(when (string= opened "-")
 	  (let (beg end)
 	    (setq beg (point))
@@ -1058,7 +1065,6 @@ return value is diffs '(-new -unread -all)."
 		      (point))))
 	    (delete-region beg end)
 	    (wl-folder-insert-entity indent entity)))
-;;;	(wl-fldmgr-reconst-entity-hashtb t t)
 	(message "Sorting...done")
 	(set-buffer-modified-p nil)))))