From: yoichi <yoichi>
Date: Wed, 12 Mar 2003 12:56:44 +0000 (+0000)
Subject: * wl-expire.el (wl-folder-archive-current-entity)
X-Git-Tag: merged-trunk-to-elmo-mark-15~2
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=deae5ddd35b29834a27b56eb0033276885ba7d31;p=elisp%2Fwanderlust.git

* wl-expire.el (wl-folder-archive-current-entity)
(wl-folder-expire-current-entity): Don't refer visible name.
* wl-folder.el (wl-folder-jump-to-current-entity): Ditto
(wl-folder-folder-name, wl-folder-entity-name): Abolished.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 3922e6a..df40d3a 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,7 +1,9 @@
 2003-03-12  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
-	* wl-fldmgr.el (wl-fldmgr-rename): Don't refer visible name.
-	(wl-fldmgr-sort,wl-fldmgr-access-display-all): Ditto.
+	* wl-fldmgr.el (wl-fldmgr-rename,wl-fldmgr-sort)
+	(wl-fldmgr-access-display-all): Don't refer visible name.
+	* wl-expire.el (wl-folder-archive-current-entity)
+	(wl-folder-expire-current-entity): 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)
@@ -9,6 +11,8 @@
 	(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-folder.el (wl-folder-folder-name, wl-folder-entity-name):
+	Abolished.
 
 2003-03-06  Kenichi OKADA  <okada@opaopa.org>
 
diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index 165e07e..740d635 100644
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -756,7 +756,7 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
   (let ((entity-name
 	 (or (wl-folder-get-folder-name-by-id
 	      (get-text-property (point) 'wl-folder-entity-id))
-	     (wl-folder-get-realname (wl-folder-folder-name)))))
+	     (wl-folder-get-entity-from-buffer))))
     (when (and entity-name
 	       (or (not (interactive-p))
 		   (y-or-n-p (format "Expire %s? " entity-name))))
@@ -774,7 +774,7 @@ ex. +ml/wl/1999_11/, +ml/wl/1999_12/."
   (let ((entity-name
 	 (or (wl-folder-get-folder-name-by-id
 	      (get-text-property (point) 'wl-folder-entity-id))
-	     (wl-folder-get-realname (wl-folder-folder-name)))))
+	     (wl-folder-get-entity-from-buffer))))
     (when (and entity-name
 	       (or (not (interactive-p))
 		   (y-or-n-p (format "Archive %s? " entity-name))))
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index 30d5dd2..81c07fb 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -229,19 +229,6 @@
 (defmacro wl-folder-buffer-group-p ()
   (` (get-text-property (point) 'wl-folder-is-group)))
 
-(defmacro wl-folder-folder-name ()
-  (` (save-excursion
-       (beginning-of-line)
-       (if (or (looking-at "^[ ]*\\[[\\+-]\\]\\(.+\\):[-0-9\\*-]+/[0-9\\*-]+/[0-9\\*-]+\n")
-	       (looking-at "^[ ]*\\([^\\[].+\\):.*\n"))
-	   (wl-match-buffer 1)))))
-
-(defmacro wl-folder-entity-name ()
-  (` (save-excursion
-       (beginning-of-line)
-       (if (looking-at "^[ ]*\\([^\\[].+\\):.*\n")
-	   (wl-match-buffer 1)))))
-
 (defun wl-folder-buffer-search-group (group)
   (let ((prev-point (point))
 	(group-regexp (concat
@@ -676,7 +663,7 @@ Optional argument ARG is repeart count."
 ;	  (wl-delete-all-overlays)
 ;	  (wl-highlight-folder-current-line)
 	  )))
-     ((setq fld-name (wl-folder-entity-name))
+     ((setq fld-name (wl-folder-get-entity-from-buffer))
       (wl-folder-set-current-entity-id
        (get-text-property (point) 'wl-folder-entity-id))
       (setq fld-name (wl-folder-get-folder-name-by-id
@@ -1437,7 +1424,7 @@ If current line is group folder, all subfolders are marked."
     (if (re-search-backward (wl-folder-unread-regex group) nil t)
 	(progn
 	  (beginning-of-line)
-	  (wl-folder-folder-name))
+	  (wl-folder-get-entity-from-buffer))
       (goto-char start-point)
       (message "No more unread folder")
       nil)))
@@ -1451,7 +1438,7 @@ If current line is group folder, all subfolders are marked."
     (if (re-search-forward (wl-folder-unread-regex group) nil t)
 	(progn
 	  (beginning-of-line)
-	  (wl-folder-folder-name))
+	  (wl-folder-get-entity-from-buffer))
       (goto-char start-point)
       (message "No more unread folder")
       nil)))