Synch up with main trunk, and prepare the release 2.12.0.

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

diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index 3ea0b0d..b84d9ed 100644 (file)
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -1174,7 +1174,8 @@ return value is diffs '(-new -unread -all)."
                  (save-excursion (forward-line -1)
                                  (wl-highlight-folder-current-line))
                  (remove-text-properties beg (point) '(wl-folder-entity-id))
-                 (setq execed t))))))
+                 (setq execed t))
+             (message "not an access group folder")))))
        (set-buffer-modified-p nil)))
     (if (or force execed)
        (progn
@@ -1267,7 +1268,8 @@ return value is diffs '(-new -unread -all)."
          (if (string= petname old-petname)
              nil
            (if (or (rassoc petname wl-folder-petname-alist)
-                   (wl-string-assoc petname wl-folder-group-alist))
+                   (and is-group
+                        (wl-string-assoc petname wl-folder-group-alist)))
                (message "%s: already exists" petname)
              (wl-folder-append-petname name petname)
              (setq change t)))))