Sync with Emacs-21_2+LEIM.

diff --git a/mail/feedmail.el b/mail/feedmail.el
index 9858764..d745802 100644 (file)
--- a/mail/feedmail.el
+++ b/mail/feedmail.el
@@ -308,7 +308,7 @@
 (defgroup feedmail nil
   "Assist other email packages to massage outgoing messages."
   :link '(url-link "http://www.carpenter.org/feedmail/feedmail.html")
-  :link '(emacs-commentary "feedmail")
+  :link '(emacs-commentary-link "feedmail")
   :group 'mail)
 
 (defgroup feedmail-misc nil

diff --git a/mail/smtpmail.el b/mail/smtpmail.el
index d037486..5d14d6b 100644 (file)
--- a/mail/smtpmail.el
+++ b/mail/smtpmail.el
@@ -286,7 +286,10 @@ This is relative to `smtpmail-queue-dir'.")
                                                   (end-of-line)
                                                   (point))))
        (load file-msg)
-       (setq tembuf (binary-find-file-noselect file-msg))
+       ;; Insert the message literally: it is already encoded as per
+       ;; the MIME headers, and code conversions might guess the
+       ;; encoding wrongly.
+       (setq tembuf (find-file-noselect file-msg nil t))
        (if smtpmail-recipient-address-list
            (smtp-send-buffer user-mail-address
                              smtpmail-recipient-address-list tembuf)

diff --git a/poe/apel-ver.el b/poe/apel-ver.el
index 7eed0e9..58402d6 100644 (file)
--- a/poe/apel-ver.el
+++ b/poe/apel-ver.el
@@ -35,6 +35,7 @@
 (require 'product)                     ; beware of circular dependency.
 (provide 'apel-ver)                    ; these two files depend on each other.
 
+(eval-and-compile
 (product-provide 'apel-ver
   ;; (product-define "APEL" nil '(9 23))       ; comment.
   ;; (product-define "APEL" nil '(10 0))       ; Released 24 December 1999
@@ -42,7 +43,7 @@
   ;; (product-define "APEL" nil '(10 2))       ; Released 01 March 2000
   ;; (product-define "APEL" nil '(10 3))
   (product-define "LEMI" nil '(1 14 0))
-  )
+  ))
 
 (defun apel-version ()
   "Print APEL version."