Fix last `wl-kill-buffers' change.

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

diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index ec79f5b..a505606 100644 (file)
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -107,27 +107,27 @@
 ;;
 
 (defmacro wl-fldmgr-delete-line ()
-  (` (delete-region (save-excursion (beginning-of-line)
-                                   (point))
-                   (save-excursion (end-of-line)
-                                   (+ 1 (point))))))
+  '(delete-region (save-excursion (beginning-of-line)
+                                 (point))
+                 (save-excursion (end-of-line)
+                                 (+ 1 (point)))))
 
 (defmacro wl-fldmgr-make-indent (level)
-  (` (concat " " (make-string (* 2 (, level)) ? ))))
+  `(concat " " (make-string (* 2 ,level) ,(string-to-char " "))))
 
 (defmacro wl-fldmgr-get-entity-id (&optional entity)
-  (` (get-text-property (if (, entity)
-                           0
-                         (point))
-                       'wl-folder-entity-id
-                       (, entity))))
+  `(get-text-property (if ,entity
+                         0
+                       (point))
+                     'wl-folder-entity-id
+                     ,entity))
 
 (defmacro wl-fldmgr-assign-id (entity &optional id)
-  (` (let ((entity-id (or (, id) wl-folder-entity-id)))
-       (put-text-property 0 (length (, entity))
-                         'wl-folder-entity-id
-                         entity-id
-                         (, entity)))))
+  `(let ((entity-id (or ,id wl-folder-entity-id)))
+     (put-text-property 0 (length ,entity)
+                       'wl-folder-entity-id
+                       entity-id
+                       ,entity)))
 
 (defsubst wl-fldmgr-read-string (str)
   (if (string-match "\n" str)
@@ -831,34 +831,20 @@ return value is diffs '(-new -unread -all)."
        (setq indent (wl-fldmgr-make-indent (nth 1 tmp)))
        (or name
            (setq name (wl-fldmgr-read-string
-                       (wl-summary-read-folder wl-default-folder
-                                               "to add" nil t))))
-       (let ((parent (nth 2 (wl-fldmgr-get-path-from-buffer))))
-         (if (eq (cdr parent) 'access)
-             (if (string-match
-                  (format "^%s" (regexp-quote (car parent))) name)
-                 ;; force update access group
-                 (progn
-                   (wl-folder-confirm-existence
-                    (wl-folder-get-elmo-folder name))
-                   (wl-folder-open-close)
-                   (wl-folder-jump-to-current-entity t)
-                   (setq ret-val t))
-               (error "Can't insert folder under access group"))
-           (wl-folder-confirm-existence (wl-folder-get-elmo-folder name))
-           ;; maybe add elmo-plugged-alist.
-           (elmo-folder-set-plugged (wl-folder-get-elmo-folder
-                                     (if (listp name) (car name) name))
-                                    wl-plugged t)
-           (when (setq diffs
-                       (wl-add-entity
-                        path (list name) wl-folder-entity (nth 3 tmp) t))
-             (wl-folder-insert-entity indent name)
-             (wl-fldmgr-update-group path diffs)
-             (setq wl-fldmgr-modified t)
-             (set-buffer-modified-p nil)
-             (setq ret-val t)))
-         ret-val)))))
+                       (wl-summary-read-folder wl-default-folder "to add"))))
+       ;; maybe add elmo-plugged-alist.
+       (elmo-folder-set-plugged (wl-folder-get-elmo-folder
+                                 (if (listp name) (car name) name))
+                                wl-plugged t)
+       (when (setq diffs
+                   (wl-add-entity
+                    path (list name) wl-folder-entity (nth 3 tmp) t))
+         (wl-folder-insert-entity indent name)
+         (wl-fldmgr-update-group path diffs)
+         (setq wl-fldmgr-modified t)
+         (set-buffer-modified-p nil)
+         (setq ret-val t)))
+      ret-val)))
 
 (defun wl-fldmgr-delete ()
   (interactive)