Synch with the flim-1_14 branch.

diff --git a/ChangeLog b/ChangeLog
index 3dce9d8..fb49aa9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-11-15  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * smtp.el (smtp-send-buffer): Error if `smtp-server' is nil.
+
 2002-11-15  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
        * FLIM-ELS (flim-version-specific-modules): Don't install mailcap.el.

diff --git a/smtp.el b/smtp.el
index 4706bff..ff13f5a 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -346,7 +346,8 @@ BUFFER may be a buffer or a buffer name which contains mail message."
     (let ((server
           (if (functionp smtp-server)
               (funcall smtp-server sender recipients)
-            smtp-server))
+            (or smtp-server
+                (error "`smtp-server' not defined"))))
          (package
           (smtp-make-package sender recipients buffer))
          (smtp-open-connection-function