From c858144859641b0dc23d73a47041f355897088cd Mon Sep 17 00:00:00 2001
From: teranisi <teranisi>
Date: Sat, 4 Sep 2004 02:38:09 +0000
Subject: [PATCH] * wl-draft.el (wl-draft-send-confirm): Call
 `wl-mime-quit-preview' instead of `wl-draft-quit-preview'.

* wl-mime.el (toplevel): Avoid compile warning.
(wl-mime-quit-preview): New function
(formarly defined as `wl-draft-quit-preview').
(wl-draft-preview-message): Use `wl-mime-quit-preview' for
quitting method.

* wl-draft.el: Move wl-draft-quit-preview to wl-mime.el.
---
 wl/ChangeLog     |   11 +++++++++++
 wl/wl-draft.el   |   14 +-------------
 wl/wl-mime.el    |   17 +++++++++++++++++
 wl/wl-summary.el |    6 +-----
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 22f72c8..32469d7 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,5 +1,16 @@
 2004-09-04  Yuuichi Teranishi  <teranisi@gohome.org>
 
+	* wl-draft.el (wl-draft-send-confirm): Call `wl-mime-quit-preview'
+	instead of `wl-draft-quit-preview'.
+
+	* wl-mime.el (toplevel): Avoid compile warning.
+	(wl-mime-quit-preview): New function
+	(formarly defined as `wl-draft-quit-preview').
+	(wl-draft-preview-message): Use `wl-mime-quit-preview' for
+	quitting method.
+
+	* wl-draft.el: Move wl-draft-quit-preview to wl-mime.el.
+
 	* wl-folder.el (wl-folder-set-flag): Renamed from
 	`wl-draft-set-flag-on-parent'.
 
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 0a84b35..45fe622 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -1282,18 +1282,6 @@ This variable is valid when `wl-interactive-send' has non-nil value."
   :type 'boolean
   :group 'wl-draft)
 
-(defun wl-draft-quit-preview ()
-  "Quitting method for mime-view."
-  (let* ((temp mime-edit-temp-message-buffer)
-	 (window (selected-window))
-	 buf)
-    (mime-preview-kill-buffer)
-    (set-buffer temp)
-    (setq buf mime-edit-buffer)
-    (kill-buffer temp)
-    (select-window window)
-    (switch-to-buffer buf)))
-
 (defun wl-draft-send-confirm ()
   (let (answer)
     (unwind-protect
@@ -1329,7 +1317,7 @@ This variable is valid when `wl-interactive-send' has non-nil value."
 		      (throw 'done nil)))))))
 	  (quit nil))
       (when wl-draft-send-confirm-with-preview
-	(wl-draft-quit-preview)))))
+	(wl-mime-quit-preview)))))
 
 (defun wl-draft-send (&optional kill-when-done mes-string)
   "Send current draft message.
diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 8e79c5e..5dd9480 100644
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -39,6 +39,8 @@
   (defalias-maybe 'pgg-display-output-buffer 'ignore)
   (defalias-maybe 'pgg-verify-region 'ignore))
 
+(defvar mime-edit-temp-message-buffer)
+
 ;;; Draft
 
 (defalias 'wl-draft-editor-mode 'mime-edit-mode)
@@ -185,6 +187,18 @@ It calls following-method selected from variable
 	  ((boundp attr)
 	   (symbol-value attr)))))
 
+(defun wl-mime-quit-preview ()
+  "Quitting method for mime-view."
+  (let* ((temp mime-edit-temp-message-buffer)
+	 (window (selected-window))
+	 buf)
+    (mime-preview-kill-buffer)
+    (set-buffer temp)
+    (setq buf mime-edit-buffer)
+    (kill-buffer temp)
+    (select-window window)
+    (switch-to-buffer buf)))
+
 (defun wl-draft-preview-message ()
   "Preview editing message."
   (interactive)
@@ -227,6 +241,9 @@ It calls following-method selected from variable
 		   (signal (car err) (cdr err)))))))
 	   mime-edit-translate-buffer-hook)))
     (mime-edit-preview-message)
+    (make-local-variable 'mime-preview-quitting-method-alist)
+    (setq mime-preview-quitting-method-alist
+	  '((mime-temp-message-mode . wl-mime-quit-preview)))
     (let ((buffer-read-only nil))
       (when wl-highlight-body-too
 	(wl-highlight-body))
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index fafdea7..187efff 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -2017,7 +2017,7 @@ This function is defined for `window-scroll-functions'"
 	(funcall wl-summary-buffer-mode-line-formatter)))
 
 (defun wl-summary-jump-to-msg (&optional number)
-  (interactive)
+  (interactive "NJump to Number:")
   (let ((num (or number
 		 (string-to-int
 		  (read-from-minibuffer "Jump to Message(No.): ")))))
@@ -2029,10 +2029,6 @@ This function is defined for `window-scroll-functions'"
 	(progn (beginning-of-line) t)
       nil)))
 
-(defun wl-summary-digit-jump (number)
-  (interactive "NJump to Number: ")
-  (wl-summary-jump-to-msg number))
-
 (defun wl-summary-highlight-msgs (msgs)
   (save-excursion
     (let ((len (length msgs))
-- 
1.7.10.4