*** empty log message ***

[gnus] / lisp / message.el

diff --git a/lisp/message.el b/lisp/message.el
index 24cbee5..70ef73c 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -40,6 +40,7 @@
     (require 'mail-abbrevs)
   (require 'mailabbrev))
 (require 'rfc2047)
+(require 'mm-bodies)
 
 (defgroup message '((user-mail-address custom-variable)
                    (user-full-name custom-variable))
@@ -1067,7 +1068,7 @@ The cdr of ech entry is a function for applying the face to a region.")
        (erase-buffer))
     (set-buffer (get-buffer-create " *message work*"))
     (kill-all-local-variables)
-    (buffer-disable-undo (current-buffer))))
+    (mm-enable-multibyte)))
 
 (defun message-functionp (form)
   "Return non-nil if FORM is funcallable."
@@ -1386,8 +1387,7 @@ C-c C-r  message-caesar-buffer-body (rot13 the message body)."
   (setq adaptive-fill-first-line-regexp
        (concat "[ \t]*[-a-z0-9A-Z]*>+[ \t]*\\|"
                adaptive-fill-first-line-regexp))
-  (when (fboundp 'set-buffer-multibyte)
-    (set-buffer-multibyte t))
+  (mm-enable-multibyte)
   (run-hooks 'text-mode-hook 'message-mode-hook))
 
 \f
@@ -2025,6 +2025,7 @@ the user from the mailer."
       (rfc2047-encode-message-header)
       ;; Let the user do all of the above.
       (run-hooks 'message-header-hook))
+    (message-encode-message-body)
     (unwind-protect
        (save-excursion
          (set-buffer tembuf)
@@ -2196,6 +2197,7 @@ to find out how to use this."
       (rfc2047-encode-message-header)
       ;; Let the user do all of the above.
       (run-hooks 'message-header-hook))
+    (message-encode-message-body)
     (message-cleanup-headers)
     (if (not (message-check-news-syntax))
        (progn
@@ -2489,7 +2491,7 @@ to find out how to use this."
           (y-or-n-p "Empty article.  Really post? "))))
    ;; Check for control characters.
    (message-check 'control-chars
-     (if (re-search-forward "[\000-\007\013\015-\037\200-\237]" nil t)
+     (if (re-search-forward "[\000-\007\013\015-\032\034-\037\200-\237]" nil t)
         (y-or-n-p
          "The article contains control characters.  Really post? ")
        t))
@@ -4023,6 +4025,32 @@ regexp varstr."
       (setq idx (1+ idx)))
     string))
 
+;;;
+;;; MIME functions
+;;;
+
+(defun message-encode-message-body ()
+  "Examine the message body, encode it, and add the requisite headers."
+  (when (featurep 'mule)
+    (save-excursion
+      (save-restriction
+       (message-narrow-to-headers)
+       (message-remove-header
+        "^Content-Transfer-Encoding:\\|^Content-Type:\\|^Mime-Version:" t)
+       (goto-char (point-max))
+       (widen)
+       (narrow-to-region (point) (point-max))
+       (let* ((charset (mm-encode-body))
+              (encoding (mm-body-encoding)))
+         (when (consp charset)
+           (error "Can't encode messages with multiple charsets (yet)"))
+         (widen)
+         (message-narrow-to-headers)
+         (goto-char (point-max))
+         (mm-insert-rfc822-headers
+          (or charset (mm-mule-charset-to-mime-charset 'ascii))
+          encoding))))))
+
 (run-hooks 'message-load-hook)
 
 (provide 'message)