From b28c84804f69ca7bcef44f009148bc8c92fd3467 Mon Sep 17 00:00:00 2001 From: yoichi Date: Wed, 12 Mar 2003 05:58:25 +0000 Subject: [PATCH] * wl-fldmgr.el (wl-fldmgr-rename): Don't refer visible name. (wl-fldmgr-sort,wl-fldmgr-access-display-all): Ditto. * wl-folder.el (wl-folder-jump-to-current-entity) (wl-folder-update-recursive-current-entity,wl-folder-next-unsync) (wl-folder-open-folder-sub,wl-folder-open-all) (wl-folder-write-current-folder): Ditto. (wl-folder-insert-entity): Don't use petname for normal group. * wl-fldmgr.el (wl-fldmgr-insert-folders-buffer): car of the name is the real name. --- wl/ChangeLog | 12 ++++++++++++ wl/wl-fldmgr.el | 14 ++++---------- wl/wl-folder.el | 21 ++++++++++++--------- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 9b0b230..3922e6a 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,15 @@ +2003-03-12 Yoichi NAKAYAMA + + * wl-fldmgr.el (wl-fldmgr-rename): Don't refer visible name. + (wl-fldmgr-sort,wl-fldmgr-access-display-all): Ditto. + * wl-folder.el (wl-folder-jump-to-current-entity) + (wl-folder-update-recursive-current-entity,wl-folder-next-unsync) + (wl-folder-open-folder-sub,wl-folder-open-all) + (wl-folder-write-current-folder): Ditto. + (wl-folder-insert-entity): Don't use petname for normal group. + * wl-fldmgr.el (wl-fldmgr-insert-folders-buffer): car of the name + is the real name. + 2003-03-06 Kenichi OKADA * wl-draft.el (wl-draft-create-buffer): Add diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el index 768d640..621d1ff 100644 --- a/wl/wl-fldmgr.el +++ b/wl/wl-fldmgr.el @@ -871,7 +871,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) @@ -1053,9 +1053,7 @@ return value is diffs '(-new -unread -all)." (looking-at wl-folder-group-regexp)) (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-entity)) + (setq entity (wl-folder-get-entity-from-buffer)) (message "Sorting...") (setq flist (sort (nth 2 entity) wl-fldmgr-sort-function)) (when arg (setq flist (nreverse flist))) @@ -1196,9 +1194,7 @@ return value is diffs '(-new -unread -all)." (looking-at wl-folder-group-regexp)) (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-entity)) + (setq entity (wl-folder-get-entity-from-buffer)) (when (eq (nth 1 entity) 'access) (save-excursion (if (string= opened "-") @@ -1310,10 +1306,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 diff --git a/wl/wl-folder.el b/wl/wl-folder.el index 4807a64..30d5dd2 100644 --- a/wl/wl-folder.el +++ b/wl/wl-folder.el @@ -619,7 +619,7 @@ Optional argument ARG is repeart count." ((and (wl-folder-buffer-group-p) (looking-at wl-folder-group-regexp)) (save-excursion - (setq fname (wl-folder-get-realname (wl-match-buffer 3))) + (setq fname (wl-folder-get-entity-from-buffer)) (setq indent (wl-match-buffer 1)) (setq opened (wl-match-buffer 2)) (if (string= opened "+") @@ -719,7 +719,7 @@ Optional argument ARG is repeart count." (if entity () (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))) (let ((inhibit-read-only t) (entities (list entity)) @@ -1421,8 +1421,7 @@ If current line is group folder, all subfolders are marked." (if (or (wl-folder-buffer-group-p) (not plugged) (setq entity - (wl-folder-get-realname - (wl-folder-folder-name))) + (wl-folder-get-entity-from-buffer)) (elmo-folder-plugged-p entity)) (throw 'found t)))) (beginning-of-line) @@ -1715,7 +1714,9 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." ;;; wl-folder-newsgroups-hashtb)))) ;;; (message "fetching folder entries...done")) (insert indent "[" (if as-opened "-" "+") "]" - (wl-folder-get-petname (car entity))) + (if (eq (cadr entity) 'access) + (wl-folder-get-petname (car entity)) + (car entity))) (setq group-name-end (point)) (insert ":0/0/0\n") (wl-folder-put-folder-property @@ -1762,7 +1763,9 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'." (wl-highlight-folder-current-line ret-val))) (setq ret-val (wl-folder-calc-finfo entity)) (insert indent "[" (if as-opened "-" "+") "]" - (wl-folder-get-petname (car entity)) + (if (eq (cadr entity) 'access) + (wl-folder-get-petname (car entity)) + (car entity)) (format ":%d/%d/%d" (or (nth 0 ret-val) 0) (or (nth 1 ret-val) 0) @@ -2458,7 +2461,7 @@ Use `wl-subscribed-mailing-list'." (string= "+" (wl-match-buffer 2)));; closed group (save-excursion (setq indent (wl-match-buffer 1)) - (setq name (wl-folder-get-realname (wl-match-buffer 3))) + (setq name (wl-folder-get-entity-from-buffer)) (setq entity (wl-folder-search-group-entity-by-name name wl-folder-entity)) @@ -2517,7 +2520,7 @@ Use `wl-subscribed-mailing-list'." "^\\([ ]*\\)\\[\\([+]\\)\\]\\(.+\\):[-0-9-]+/[0-9-]+/[0-9-]+\n" nil t) (setq indent (wl-match-buffer 1)) - (setq name (wl-folder-get-realname (wl-match-buffer 3))) + (setq name (wl-folder-get-entity-from-buffer)) (setq entity (wl-folder-search-group-entity-by-name name wl-folder-entity)) @@ -2830,7 +2833,7 @@ Call `wl-summary-write-current-folder' with current folder name." (interactive) (unless (wl-folder-buffer-group-p) (wl-summary-write-current-folder - (wl-folder-get-realname (wl-folder-entity-name))))) + (wl-folder-get-entity-from-buffer)))) (defun wl-folder-mimic-kill-buffer () "Kill the current (Folder) buffer with query." -- 1.7.10.4