2005-09-15 Chong Yidong <cyd@stupidchicken.com>

	* simple.el (sendmail-user-agent-compose): Revert last change.

2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c15cba13b39..d701bbf0257 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (sendmail-user-agent-compose): Revert last change.
+
 2005-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * net/ange-ftp.el (ange-ftp-process-filter): Revert to ^#+$.
diff --git a/lisp/simple.el b/lisp/simple.el
index 3d24a9222d4..fe58a47610e 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -4444,8 +4444,9 @@ See also `read-mail-command' concerning reading mail."
   (let ((cc (cdr (assoc-string "cc" other-headers t)))
         (in-reply-to (cdr (assoc-string "in-reply-to" other-headers t)))
         (body (cdr (assoc-string "body" other-headers t))))
-    (mail (if continue t 'new)
-          to subject in-reply-to cc yank-action send-actions)
+    (or (mail continue to subject in-reply-to cc yank-action send-actions)
+        continue
+        (error "Message aborted"))
     (save-excursion
       (rfc822-goto-eoh)
       (while other-headers