From e2ab84759a644ece1b02672aa7a872804113d4cf Mon Sep 17 00:00:00 2001 From: teranisi Date: Wed, 16 Jul 2003 00:34:22 +0000 Subject: [PATCH] 2003-07-16 Yuuichi Teranishi * wl-action.el (wl-summary-register-target-mark): Fixed argument. (wl-summary-target-mark-set-action): Fixed. (wl-summary-define-mark-action): Fixed quotation. 2003-07-15 Mito * wl-summary.el (wl-summary-entity-info-msg): Don't replace '%' to '%%'. --- wl/ChangeLog | 11 +++++++++++ wl/wl-action.el | 17 +++++++++-------- wl/wl-summary.el | 8 +++----- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index ab3336a..bf8b567 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,14 @@ +2003-07-16 Yuuichi Teranishi + + * wl-action.el (wl-summary-register-target-mark): Fixed argument. + (wl-summary-target-mark-set-action): Fixed. + (wl-summary-define-mark-action): Fixed quotation. + +2003-07-15 Mito + + * wl-summary.el (wl-summary-entity-info-msg): Don't replace '%' to + '%%'. + 2003-07-15 Yuuichi Teranishi * wl.el (toplevel): Require wl-action. diff --git a/wl/wl-action.el b/wl/wl-action.el index 65b0413..cf4009c 100644 --- a/wl/wl-action.el +++ b/wl/wl-action.el @@ -98,7 +98,7 @@ Return number if put mark succeed" ;; Return value. number)) -(defun wl-summary-register-target-mark (number mark) +(defun wl-summary-register-target-mark (number mark data) (or (memq number wl-summary-buffer-target-mark-list) (setq wl-summary-buffer-target-mark-list (cons number wl-summary-buffer-target-mark-list)))) @@ -122,8 +122,9 @@ Return number if put mark succeed" (setq number (car numlist) numlist nil)) (setq numlist (cdr numlist))) + (wl-summary-jump-to-msg number) (setq data (funcall (wl-summary-action-argument-function action) - action number))) + (wl-summary-action-symbol action) number))) (while (not (eobp)) (when (string= (wl-summary-temp-mark) "*") (let (wl-summary-buffer-disp-msg) @@ -352,19 +353,19 @@ Return number if put mark succeed" (interactive "r") (goto-char beg) (wl-summary-mark-region-subr - ,(intern (format "wl-summary-%s" - (wl-summary-action-symbol action))) + (quote ,(intern (format "wl-summary-%s" + (wl-summary-action-symbol action)))) beg end - (if (wl-summary-action-argument-function action) - (funcall (wl-summary-action-argument-function action) - (wl-summary-action-symbol action) + (if ,(wl-summary-action-argument-function action) + (funcall ,(wl-summary-action-argument-function action) + ,(wl-summary-action-symbol action) (wl-summary-message-number)))))) (fset (intern (format "wl-summary-target-mark-%s" (wl-summary-action-symbol action))) `(lambda () ,(wl-summary-action-docstring action) (interactive) - (wl-summary-target-mark-set-action action))))) + (wl-summary-target-mark-set-action (quote ,action)))))) (defun wl-summary-get-dispose-folder (folder) (if (string= folder wl-trash-folder) diff --git a/wl/wl-summary.el b/wl/wl-summary.el index 095cab7..b6215b8 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -1028,11 +1028,9 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'." (defun wl-summary-entity-info-msg (entity finfo) (or (and entity (concat - (elmo-replace-in-string - (if (memq 'ask-folder wl-use-folder-petname) - (wl-folder-get-petname entity) - entity) - "%" "%%") + (if (memq 'ask-folder wl-use-folder-petname) + (wl-folder-get-petname entity) + entity) (if (null (car finfo)) " (? new/? unread)" (format -- 1.7.10.4