From: okazaki <okazaki>
Date: Thu, 5 Aug 2010 02:50:40 +0000 (+0000)
Subject: (smtp-submit-package): Handle the case that `smtp-find-connection' returns
X-Git-Tag: flim-1_14-wl-root
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77c70bd6e916629878a25dc1c23e45c56341edb3;p=elisp%2Fflim.git

(smtp-submit-package): Handle the case that `smtp-find-connection' returns
 nil in unwind forms.
---

diff --git a/ChangeLog b/ChangeLog
index 8e4e5d0..d2ff872 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-05  Tetsurou Okazaki  <okazaki@be.to>
+
+	* smtp.el (smtp-submit-package): Handle the case that
+	`smtp-find-connection' returns nil in unwind forms.
+
 2010-06-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* FLIM-CFG: Add emu subdirectory to load-path when LISPDIR is
diff --git a/smtp.el b/smtp.el
index ba95db6..fe511e9 100644
--- a/smtp.el
+++ b/smtp.el
@@ -399,7 +399,7 @@ BUFFER may be a buffer or a buffer name which contains mail message."
 	(smtp-primitive-rcptto package)
 	(smtp-primitive-data package))
     (let ((connection (smtp-find-connection (current-buffer))))
-      (when (smtp-connection-opened connection)
+      (when (and connection (smtp-connection-opened connection))
 	(condition-case nil
 	    (smtp-primitive-quit package)
 	  (smtp-error))