Sync with flim-1_14_1-pre1.

diff --git a/mail/smtp.el b/mail/smtp.el
index 1ccc0e3..75cbae0 100644 (file)
--- a/mail/smtp.el
+++ b/mail/smtp.el
@@ -249,6 +249,7 @@ of the host to connect to.  SERVICE is name of the service desired."
 
 ;;;###autoload
 (defun smtp-via-smtp (sender recipients buffer)
+  "Like `smtp-send-buffer', but sucks in any errors."
   (condition-case nil
       (progn
        (smtp-send-buffer sender recipients buffer)
@@ -259,6 +260,10 @@ of the host to connect to.  SERVICE is name of the service desired."
 
 ;;;###autoload
 (defun smtp-send-buffer (sender recipients buffer)
+  "Send a message.
+SENDER is an envelope sender address.
+RECIPIENTS is a list of envelope recipient addresses.
+BUFFER may be a buffer or a buffer name which contains mail message."
   (let ((server
         (if (functionp smtp-server)
             (funcall smtp-server sender recipients)

diff --git a/mime/eword-decode.el b/mime/eword-decode.el
index d14016c..0fc7d33 100644 (file)
--- a/mime/eword-decode.el
+++ b/mime/eword-decode.el
@@ -501,8 +501,8 @@ If SEPARATOR is not nil, it is used as header separator."
        ))
    code-conversion))
 
-;; (define-obsolete-function-alias 'eword-decode-header
-;;   'mime-decode-header-in-buffer)
+(defalias 'eword-decode-header 'mime-decode-header-in-buffer)
+(make-obsolete 'eword-decode-header 'mime-decode-header-in-buffer)
 
 
 ;;; @ encoded-word decoder

diff --git a/mime/mime-def.el b/mime/mime-def.el
index 0f5579c..f4ced4d 100644 (file)
--- a/mime/mime-def.el
+++ b/mime/mime-def.el
@@ -34,7 +34,7 @@
   )
 
 (eval-and-compile
-  (defconst mime-library-product ["FLIM" (1 14 0) "Ninokuchi"]
+  (defconst mime-library-product ["FLIM" (1 14 1) "Yagi"]
     "Product name, version number and code name of MIME-library package."))
 
 (defmacro mime-product-name (product)