* wl-draft.el (wl-draft-create-contents): Fix docstring.

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

diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index 71986d1..b572930 100644 (file)
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -900,8 +900,6 @@ return value is diffs '(-new -unread -all)."
        (let* ((tmp (wl-fldmgr-get-path-from-buffer))
               (old-folder (nth 4 tmp))
               new-folder)
-         (if (eq (cdr (nth 2 tmp)) 'access)
-             (error "Can't rename access folder"))
          (setq new-folder
                (wl-fldmgr-read-string
                 (wl-summary-read-folder old-folder "to rename" t t old-folder)))
@@ -909,13 +907,29 @@ return value is diffs '(-new -unread -all)."
                  (file-exists-p (elmo-folder-msgdb-path
                                  (wl-folder-get-elmo-folder new-folder))))
              (error "Already exists folder: %s" new-folder))
+         (if (and (eq (cdr (nth 2 tmp)) 'access)
+                  (null wl-fldmgr-allow-rename-access-group)
+                  (null (string-match
+                         (format "^%s" (regexp-quote (car (nth 2 tmp))))
+                         new-folder)))
+             (error "Can't rename access folder"))
          (elmo-folder-rename (wl-folder-get-elmo-folder old-folder)
                              new-folder)
          (wl-folder-set-entity-info
           new-folder
           (wl-folder-get-entity-info old-folder))
-         (when (wl-fldmgr-cut tmp nil t)
-           (wl-fldmgr-add new-folder))))))))
+         (wl-folder-clear-entity-info old-folder)
+         (if (eq (cdr (nth 2 tmp)) 'access)
+
+             ;; force update access group
+             (progn
+               (wl-folder-open-close)
+               (wl-folder-jump-to-current-entity t)
+               (message "%s is renamed to %s" old-folder new-folder)
+               (sit-for 1))
+           ;; update folder list
+           (when (wl-fldmgr-cut tmp nil t)
+             (wl-fldmgr-add new-folder)))))))))
 
 (defun wl-fldmgr-make-access-group ()
   (interactive)
@@ -1001,18 +1015,25 @@ 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)))))))
+    (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 ()
   (interactive)