* check-modules.el (test-shimbun): Check `shimbun-server'.

[elisp/wanderlust.git] / wl / wl-fldmgr.el

diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index 768d640..caced28 100644 (file)
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -387,11 +387,11 @@ return value is diffs '(-new -unread -all)."
            (cond
             ((stringp (car new2)) ;; folder
              (cond
-              ((wl-string-member (car new2) flist)
+              ((elmo-string-member (car new2) flist)
                (and errmes (message "%s: already exists" (car new2)))
                (throw 'success nil))
               ((and access
-                    (not (wl-string-member (car new2) unsubscribes)))
+                    (not (elmo-string-member (car new2) unsubscribes)))
                (and errmes (message "%s: not access group folder" (car new2)))
                (throw 'success nil))))
             (t                    ;; group
@@ -850,15 +850,8 @@ return value is diffs '(-new -unread -all)."
     (let* ((inhibit-read-only t)
           (tmp (wl-fldmgr-get-path-from-buffer))
           (entity (elmo-string (nth 4 tmp)))
-          (folder (wl-folder-get-elmo-folder entity))
-          (msgs (and (elmo-folder-exists-p folder)
-                     (elmo-folder-list-messages folder))))
-      (when (yes-or-no-p (format "%sDo you really want to delete \"%s\"? "
-                                (if (> (length msgs) 0)
-                                    (format "%d msg(s) exists. " (length msgs))
-                                  "")
-                                entity))
-       (elmo-folder-delete folder)
+          (folder (wl-folder-get-elmo-folder entity)))
+      (when (elmo-folder-delete folder)
        (wl-fldmgr-cut tmp nil t)))))
 
 (defun wl-fldmgr-rename ()
@@ -871,7 +864,7 @@ return value is diffs '(-new -unread -all)."
        ((and (wl-folder-buffer-group-p)
             (looking-at wl-folder-group-regexp)) ;; group
        (let* ((indent (wl-match-buffer 1))
-              (old-group (wl-folder-get-realname (wl-match-buffer 3)))
+              (old-group (wl-folder-get-entity-from-buffer))
               (group-entity (wl-folder-search-group-entity-by-name
                              old-group wl-folder-entity))
               group)
@@ -1054,7 +1047,7 @@ return value is diffs '(-new -unread -all)."
        (setq indent (wl-match-buffer 1))
        (setq opened (wl-match-buffer 2))
        (setq entity (wl-folder-search-group-entity-by-name
-                     (wl-folder-get-realname (wl-match-buffer 3))
+                     (wl-folder-get-entity-from-buffer)
                      wl-folder-entity))
        (message "Sorting...")
        (setq flist (sort (nth 2 entity) wl-fldmgr-sort-function))
@@ -1197,7 +1190,7 @@ return value is diffs '(-new -unread -all)."
       (setq indent (wl-match-buffer 1))
       (setq opened (wl-match-buffer 2))
       (setq entity (wl-folder-search-group-entity-by-name
-                   (wl-folder-get-realname (wl-match-buffer 3))
+                   (wl-folder-get-entity-from-buffer)
                    wl-folder-entity))
       (when (eq (nth 1 entity) 'access)
        (save-excursion
@@ -1310,10 +1303,8 @@ return value is diffs '(-new -unread -all)."
                       "")
                     "\n"))
            ((consp name)
-            (let ((group (wl-folder-get-realname (car name)))
+            (let ((group (car name))
                   (type (nth 1 name)))
-              (if (not (string= group (car name))) ; petname.
-                  (wl-append pet-entities (list (car name))))
               (cond ((eq type 'group)
                      (insert indent group "{\n")
                      (setq pet-entities