Importing Pterodactyl Gnus v0.49.

[elisp/gnus.git-] / lisp / message.el

diff --git a/lisp/message.el b/lisp/message.el
index 0c9a0f8..f4555b5 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -789,6 +789,18 @@ Defaults to `text-mode-abbrev-table'.")
   "Face used for displaying cited text names."
   :group 'message-faces)
 
+(defface message-mml-face
+  '((((class color)
+      (background dark))
+     (:foreground "ForestGreen"))
+    (((class color)
+      (background light))
+     (:foreground "ForestGreen"))
+    (t
+     (:bold t)))
+  "Face used for displaying MML."
+  :group 'message-faces)
+
 (defvar message-font-lock-keywords
   (let* ((cite-prefix "A-Za-z")
         (cite-suffix (concat cite-prefix "0-9_.@-"))
@@ -819,7 +831,9 @@ Defaults to `text-mode-abbrev-table'.")
       (,(concat "^[ \t]*"
                "\\([" cite-prefix "]+[" cite-suffix "]*\\)?"
                "[:>|}].*")
-       (0 'message-cited-text-face))))
+       (0 'message-cited-text-face))
+      ("<#/?\\(multi\\)part.*>"
+       (0 'message-mml-face))))
   "Additional expressions to highlight in Message mode.")
 
 ;; XEmacs does it like this.  For Emacs, we have to set the
@@ -4116,11 +4130,12 @@ regexp varstr."
        (delete-region beg (point))
        (insert "Mime-Version: 1.0\n")
        (search-forward "\n\n")
+       (forward-char -1)
        (insert line)
        (when (save-excursion
                (re-search-backward "^Content-Type: multipart/" nil t))
          (insert "This is a MIME multipart message.  If you are reading\n")
-         (insert "this, you shouldn't.\n\n"))))))
+         (insert "this, you shouldn't.\n"))))))
     
 (run-hooks 'message-load-hook)