# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1126756042 0
# Node ID 4de96b605e5545d257b8a4449c504156edd0fa50
# Parent  d7d263fcbadcc125def48a2cef60e6c863cffb03
2005-09-15  Chong Yidong  <cyd@stupidchicken.com>

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

diff -r d7d263fcbadc -r 4de96b605e55 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Sep 15 03:30:39 2005 +0000
+++ b/lisp/ChangeLog	Thu Sep 15 03:47:22 2005 +0000
@@ -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 -r d7d263fcbadc -r 4de96b605e55 lisp/simple.el
--- a/lisp/simple.el	Thu Sep 15 03:30:39 2005 +0000
+++ b/lisp/simple.el	Thu Sep 15 03:47:22 2005 +0000
@@ -4444,8 +4444,9 @@
   (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