From 5a58a9f61d0c8222ab402074409c6494c9200dc7 Mon Sep 17 00:00:00 2001
From: ichikawa <ichikawa>
Date: Fri, 4 Sep 1998 13:52:13 +0000
Subject: [PATCH] lisp/pop3-fma.el : Add error handle and fix typo.

---
 ChangeLog        |    5 +++++
 lisp/pop3-fma.el |   29 ++++++++++++++++++++++-------
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0af86e9..a6d2d61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-09-04  Katsumi Yamaoka   <t-ichi@po.shiojiri.ne.jp>
+
+	* lisp/pop3-fma.el (pop3-fma-movemail): Add error handle.
+	(pop3-fma-get-movemail-type): Fix typo.
+
 1998-09-04  Katsumi Yamaoka   <yamaoka@jpl.org>
 
 	* lisp/gnus.el (gnus-version-number): Update to 6.9.09.
diff --git a/lisp/pop3-fma.el b/lisp/pop3-fma.el
index 6326010..e95c147 100644
--- a/lisp/pop3-fma.el
+++ b/lisp/pop3-fma.el
@@ -3,7 +3,7 @@
 ;;                                                           Yasuo Okabe
 ;; Author: Tatsuya Ichikawa <t-ichi@po.shiojiri.ne.jp>
 ;;         Yasuo OKABE <okabe@kuis.kyoto-u.ac.jp>
-;; Version: 1.10
+;; Version: 1.11
 ;; Keywords: mail , gnus , pop3
 ;;
 ;; SPECIAL THANKS
@@ -90,7 +90,7 @@
   :group 'mail
   :group 'news)
 
-(defconst pop3-fma-version-number "1.10")
+(defconst pop3-fma-version-number "1.11")
 (defconst pop3-fma-codename
 ;;  "Feel the wind"		; 0.10
 ;;  "My home town"  		; 0.11
@@ -99,8 +99,8 @@
 ;;  "Money"			; 0.20
 ;;  "Still 19"       		; 0.21
 ;;  "J boy"          		; 1.00
-  "Blood line"			; 1.10
-;;  "Star ring"			; 0.xx
+;;  "Blood line"		; 1.10
+  "Star ring"			; 0.xx
 ;;  "Goodbye Game"		; 0.xx
   )
 (defconst pop3-fma-version (format "Multiple POP3 account utiliy for Gnus v%s - \"%s\""
@@ -151,6 +151,7 @@ Please do not set this valiable non-nil if you do not use Meadow.")
 (defvar str nil)
 (defvar pop3-fma-movemail-options pop3-fma-movemail-arguments)
 (defvar spool nil)
+(defvar movemail-output-buffer " *movemail-out*")
 
 (defun pop3-fma-init-message-hook ()
   (add-hook 'message-send-hook 'pop3-fma-message-add-header))
@@ -197,11 +198,24 @@ Please do not set this valiable non-nil if you do not use Meadow.")
 				     (concat "po:" pop3-maildrop)
 				     crashbox
 				     pop3-password)))))
+		(if (not (get-buffer movemail-output-buffer))
+		    (get-buffer-create movemail-output-buffer))
+		(set-buffer movemail-output-buffer)
+		(erase-buffer)
 		(apply 'call-process (concat
 				      exec-directory
 				      pop3-fma-movemail-program)
-		       nil nil nil
-		       pop3-fma-movemail-arguments))
+		       nil movemail-output-buffer nil
+		       pop3-fma-movemail-arguments)
+		(let ((string (buffer-string)))
+		  (if (> (length string) 0)
+		      (progn
+			(if (y-or-n-p
+			     (concat (substring string 0
+						(- (length string) 1))
+						" continue ??"))
+			    nil
+			  nil)))))
 	    (pop3-movemail crashbox))))
     (message "Checking new mail at %s ... " inbox)
     (call-process (concat exec-directory pop3-fma-movemail-program)
@@ -323,9 +337,10 @@ Argument PROMPT ."
 ;;
 (defun pop3-fma-get-movemail-type (inbox)
   (if (eq (nth 1 (assoc inbox pop3-fma-spool-file-alist)) 'apop)
-      lisp
+      'lisp
     pop3-fma-movemail-type))
 ;;
 (provide 'pop3-fma)
 ;;
 ;; pop3-fma.el ends here.
+
-- 
1.7.10.4