* wl-folder.el (wl-folder-complete-filter-condition): Remove !

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

diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index f457aac..821e144 100644 (file)
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -95,7 +95,12 @@
 (defun wl-fldmgr-exit ()
   (when (and wl-fldmgr-modified
             (or (not wl-interactive-save-folders)
-                (y-or-n-p "Folder view was modified.  Save current folders? ")))
+                (y-or-n-p
+                 (concat "Folder view was modified"
+                         (and wl-fldmgr-cut-entity-list
+                              (format " (%s in cut stack)"
+                                      (length wl-fldmgr-cut-entity-list)))
+                         ".  Save current folders? "))))
     (wl-fldmgr-save-folders)))
 
 ;;; Macro and misc Function
@@ -243,7 +248,7 @@ return value is diffs '(-new -unread -all)."
 
 ;; (defun wl-fldmgr-get-previous-entity (entity key-id)
 ;;   (cdr (wl-fldmgr-get-previous-entity-internal '(nil . nil) entity key-id)))
-;; 
+;;
 ;; (defun wl-fldmgr-get-previous-entity-internal (result entity key-id)
 ;;   (cond
 ;;    ((stringp entity)
@@ -766,7 +771,7 @@ return value is diffs '(-new -unread -all)."
                   (throw 'found (symbol-value atom)))))
            wl-fldmgr-add-completion-hashtb)))
        (pattern
-        (if (string-match "\\.$" 
+        (if (string-match "\\.$"
                           (elmo-folder-prefix-internal
                            (wl-folder-get-elmo-folder string)))
             (substring string 0 (match-beginning 0))
@@ -852,6 +857,7 @@ return value is diffs '(-new -unread -all)."
           (entity (elmo-string (nth 4 tmp)))
           (folder (wl-folder-get-elmo-folder entity)))
       (when (elmo-folder-delete folder)
+       (wl-folder-clear-entity-info entity)
        (wl-fldmgr-cut tmp nil t)
        (wl-fldmgr-save-access-list)))))
 
@@ -1034,7 +1040,7 @@ return value is diffs '(-new -unread -all)."
          (setq entity (nth 4 tmp)))
        (unless entity (error "No folder"))
        (wl-fldmgr-add (concat "/"
-                              (elmo-read-search-condition
+                              (wl-read-search-condition
                                wl-fldmgr-make-filter-default)
                               "/" entity))))))
 
@@ -1045,7 +1051,11 @@ return value is diffs '(-new -unread -all)."
     (let ((inhibit-read-only t)
          entity flist indent opened)
       (when (and (wl-folder-buffer-group-p)
-                (looking-at wl-folder-group-regexp))
+                (looking-at wl-folder-group-regexp)
+                (prog1
+                    (y-or-n-p (format "Sort subfolders of %s? "
+                                      (wl-folder-get-entity-from-buffer)))
+                  (message nil)))
        (setq indent (wl-match-buffer 1))
        (setq opened (wl-match-buffer 2))
        (setq entity (wl-folder-search-group-entity-by-name
@@ -1164,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
@@ -1257,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)))))