From d56976ab6b06169ee7973e4454617700406eab9b Mon Sep 17 00:00:00 2001 From: yoichi Date: Sun, 27 Jul 2003 15:06:47 +0000 Subject: [PATCH] * wl-summary.el (wl-summary-resend-message): Abolished, the feature is inherited by wl-summary-resend (put resend mark). --- NEWS | 3 +++ NEWS.ja | 3 +++ samples/en/dot.wl | 6 ------ samples/ja/dot.wl | 6 ------ wl/ChangeLog | 5 +++++ wl/wl-summary.el | 51 +-------------------------------------------------- 6 files changed, 12 insertions(+), 62 deletions(-) diff --git a/NEWS b/NEWS index 04c1a4e..7491e32 100644 --- a/NEWS +++ b/NEWS @@ -35,6 +35,9 @@ Wanderlust NEWS -- User-visible changes in Wanderlust. mark-and-actions can be define by the new variable, 'wl-summary-mark-action-list'. See its docstring for more in detail. +** The function wl-summary-resend-message is abolished. Instead of it, + you can put mark for resending by wl-summary-resend. + ** New face wl-highlight-summary-disposed-face diff --git a/NEWS.ja b/NEWS.ja index 585df18..a2a8dc1 100644 --- a/NEWS.ja +++ b/NEWS.ja @@ -32,6 +32,9 @@ Wanderlust NEWS (日本語版) -- User-visible changes in Wanderlust. マークとアクションは、新規変数 wl-summary-mark-action-list によって定義 できます。詳しくは同変数の docstring を参照してください。 +** 関数 wl-summary-resend-message は廃止されました。その代わりに + wl-summary-resend を使えば再送マークを付けることができます。 + ** 新規 face wl-highlight-summary-disposed-face diff --git a/samples/en/dot.wl b/samples/en/dot.wl index cedef09..b59ea0a 100644 --- a/samples/en/dot.wl +++ b/samples/en/dot.wl @@ -168,12 +168,6 @@ ;;; [[ Special Setting ]] -;; bind "b" in Summary to resend-message (ala mutt's "b"ounce) -;(add-hook 'wl-summary-mode-hook -; '(lambda () -; (define-key wl-summary-mode-map "b" 'wl-summary-resend-message) -; )) - ;; open unread group folder after checking. ;(add-hook 'wl-folder-check-entity-hook ; '(lambda () diff --git a/samples/ja/dot.wl b/samples/ja/dot.wl index dd262c2..65b2372 100644 --- a/samples/ja/dot.wl +++ b/samples/ja/dot.wl @@ -167,12 +167,6 @@ ;;; [[ 特殊な設定 ]] -;; サマリでの "b" をメッセージ再送にする (mutt の "b"ounce) -;(add-hook 'wl-summary-mode-hook -; '(lambda () -; (define-key wl-summary-mode-map "b" 'wl-summary-resend-message) -; )) - ;; グループをcheckした後に未読があるフォルダのグループを自動的に開く ;(add-hook 'wl-folder-check-entity-hook ; '(lambda () diff --git a/wl/ChangeLog b/wl/ChangeLog index f386014..becce91 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,8 @@ +2003-07-27 Yoichi NAKAYAMA + + * wl-summary.el (wl-summary-resend-message): Abolished, the + feature is inherited by wl-summary-resend (put resend mark). + 2003-07-27 Hiroya Murata * wl-summary.el (wl-summary-toggle-disp-msg): Set diff --git a/wl/wl-summary.el b/wl/wl-summary.el index e5abe08..56c92de 100644 --- a/wl/wl-summary.el +++ b/wl/wl-summary.el @@ -290,6 +290,7 @@ See also variable `wl-use-petname'." ["Set dispose mark" wl-summary-dispose t] ["Set refile mark" wl-summary-refile t] ["Set copy mark" wl-summary-copy t] + ["Set resend mark" wl-summary-resend t] ["Prefetch" wl-summary-prefetch t] ["Set target mark" wl-summary-target-mark t] ["Unmark" wl-summary-unmark t] @@ -297,7 +298,6 @@ See also variable `wl-use-petname'." ["Cancel posted news" wl-summary-cancel-message t] ["Supersedes message" wl-summary-supersedes-message t] ["Resend bounced mail" wl-summary-resend-bounced-mail t] - ["Resend message" wl-summary-resend-message t] ["Enter the message" wl-summary-jump-to-current-message t] ["Pipe message" wl-summary-pipe-message t] ["Print message" wl-summary-print-message t]) @@ -659,55 +659,6 @@ you." (t (message "Does not appear to be a rejected letter.")))))) -(defun wl-summary-resend-message (address) - "Resend the current message to ADDRESS." - (interactive "sResend message to: ") - (if (or (null address) (string-match "^[ \t]*$" address)) - (message "No address specified.") - (message "Resending message to %s..." address) - (save-excursion - (let ((original (wl-summary-get-original-buffer))) - ;; We first set up a normal mail buffer. - (set-buffer (get-buffer-create " *wl-draft-resend*")) - (buffer-disable-undo (current-buffer)) - (erase-buffer) - (setq wl-sent-message-via nil) - ;; Insert our usual headers. - (wl-draft-insert-from-field) - (wl-draft-insert-date-field) - (insert "to: " address "\n") - (goto-char (point-min)) - ;; Rename them all to "Resent-*". - (while (re-search-forward "^[A-Za-z]" nil t) - (forward-char -1) - (insert "Resent-")) - (widen) - (forward-line) - (delete-region (point) (point-max)) - (let ((beg (point))) - ;; Insert the message to be resent. - (insert-buffer-substring original) - (goto-char (point-min)) - (search-forward "\n\n") - (forward-char -1) - (save-restriction - (narrow-to-region beg (point)) - (wl-draft-delete-fields wl-ignored-resent-headers) - (goto-char (point-max))) - (insert mail-header-separator) - ;; Rename all old ("Previous-")Resent headers. - (while (re-search-backward "^\\(Previous-\\)*Resent-" beg t) - (beginning-of-line) - (insert "Previous-")) - ;; Quote any "From " lines at the beginning. - (goto-char beg) - (when (looking-at "From ") - (replace-match "X-From-Line: "))) - ;; Send it. - (wl-draft-dispatch-message) - (kill-buffer (current-buffer))) - (message "Resending message to %s...done" address)))) - (defun wl-summary-detect-mark-position () (let ((column wl-summary-buffer-number-column) (formatter wl-summary-buffer-line-formatter) -- 1.7.10.4