* smtp.el (smtp-fqdn): New variable.

	(smtp-make-fqdn): Use `smtp-fqdn' if non-nil.

diff --git a/ChangeLog b/ChangeLog
index d49c5eb..d42056b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2000-08-23  Kenichi OKADA <okada@opaopa.org>
 
-       * smtp.el (smtp-system-name): New variable.
-       (smtp-make-fqdn): Use `smtp-system-name' if non-nil.
+       * smtp.el (smtp-fqdn): New variable.
+       (smtp-make-fqdn): Use `smtp-fqdn' if non-nil.
 
 2000-08-23  Yuuichi Teranishi <teranisi@gohome.org>
 
@@ -13,7 +13,7 @@
 2000-08-23  Kenichi OKADA <okada@opaopa.org>
 
        * mime-def.el (mime-library-product): Up.
-
+       * SLIM-VERSION: Up.
 \f
 2000-08-12  Kenichi OKADA   <okada@opaopa.org>
 

diff --git a/SLIM-VERSION b/SLIM-VERSION
index 560d4c9..7e4eb26 100644 (file)
--- a/SLIM-VERSION
+++ b/SLIM-VERSION
@@ -11,3 +11,5 @@
 
 1.14.0 \e$B0BG\$J$D$_\e(B
 1.14.1 \e$B>>ED=c\e(B
+1.14.2 \e$B2C8n0!0M\e(B
+

diff --git a/mime-def.el b/mime-def.el
index 24c8244..fdc2e03 100644 (file)
--- a/mime-def.el
+++ b/mime-def.el
@@ -36,7 +36,7 @@
   )
 
 (eval-and-compile
-  (defconst mime-library-product ["SLIM" (1 14 2) "\e$B>>ED=c\e(B"]
+  (defconst mime-library-product ["SLIM" (1 14 2) "\e$B2C8n0!0M\e(B"]
     "Product name, version number and code name of MIME-library package."))
 
 (defmacro mime-product-name (product)

diff --git a/smtp.el b/smtp.el
index 6281fc9..903671b 100644 (file)
--- a/smtp.el
+++ b/smtp.el
@@ -81,6 +81,11 @@ don't define this value."
   :type '(choice (const nil) string)
   :group 'smtp)
 
+(defcustom smtp-fqdn nil
+  "*User's fully qualified domain name."
+  :type '(choice (const nil) string)
+  :group 'smtp)
+
 (defcustom smtp-debug-info nil
   "*smtp debug info printout. messages and process buffer."
   :type 'boolean
@@ -119,12 +124,14 @@ don't define this value."
   "Return user's fully qualified domain name."
   (let ((system-name (system-name)))
     (cond
+     (smtp-fqdn
+      smtp-fqdn)
      (smtp-local-domain
       (concat system-name "." smtp-local-domain))
      ((string-match "[^.]\\.[^.]" system-name)
       system-name)
      (t
-      (error "Cannot generate valid FQDN. Set `smtp-local-domain' correctly.")))))
+      (error "Cannot generate valid FQDN. Set `smtp-fqdn' or `smtp-local-domain' correctly.")))))
 
 (defun smtp-via-smtp (sender recipients smtp-text-buffer)
   (let ((server (if (functionp smtp-server)