Sync.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3aa24f7..66046ec 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-28 01:16:10  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-send-mail-partially): Remove CTE.
+
 2000-04-28 00:31:53  Shenghuo ZHU  <zsh@cs.rochester.edu>
 
        * lpath.el: Fbind put-image for XEmacs.

diff --git a/lisp/lpath.el b/lisp/lpath.el
index f6ee51d..bfeffdf 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -48,7 +48,7 @@
                     temp-directory babel-fetch babel-wash
                     find-coding-systems-for-charsets sc-cite-regexp
                     vcard-pretty-print image-type-available-p
-                    put-image
+                    put-image create-image  display-graphic-p
                     make-overlay overlay-put make-symbolic-link))
       (maybe-bind '(global-face-data
                    mark-active transient-mark-mode mouse-selection-click-count
@@ -101,6 +101,7 @@
                 rmail-summary-exists rmail-select-summary rmail-update-summary
                 url-generic-parse-url valid-image-instantiator-format-p
                 babel-fetch babel-wash sc-cite-regexp
+                put-image create-image display-graphic-p
                 vcard-pretty-print image-type-available-p
                 coding-system-get find-coding-system
                 find-coding-systems-for-charsets find-coding-systems-region

diff --git a/lisp/message.el b/lisp/message.el
index a91824c..53cc5b9 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2802,6 +2802,7 @@ This sub function is for exclusive use of `message-send-mail'."
              (insert header)
              (message-remove-header "Mime-Version")
              (message-remove-header "Content-Type")
+             (message-remove-header "Content-Transfer-Encoding")
              (message-remove-header "Message-ID")
              (message-remove-header "Lines")
              (goto-char (point-max))