Fix translations.

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

diff --git a/lisp/mml.el b/lisp/mml.el
index cc16def..36b8344 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -1,6 +1,7 @@
 ;;; mml.el --- A package for parsing and validating MML documents
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-;;        Free Software Foundation, Inc.
+
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
@@ -413,8 +414,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
        (let* ((raw (cdr (assq 'raw cont)))
               (filename (cdr (assq 'filename cont)))
               (type (or (cdr (assq 'type cont))
-                        (and filename (mm-default-file-encoding filename))
-                        "application/octet-stream"))
+                        (if filename
+                            (or (mm-default-file-encoding filename)
+                                "application/octet-stream")
+                          "text/plain")))
               (charset (cdr (assq 'charset cont)))
               (coding (mm-charset-to-coding-system charset))
               encoding flowed coded)
@@ -544,8 +547,10 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
          (insert "\n\n")
          (insert "Content-Type: "
                  (or (cdr (assq 'type cont))
-                     (and name (mm-default-file-encoding name))
-                     "application/octet-stream")
+                     (if name
+                         (or (mm-default-file-encoding name)
+                             "application/octet-stream")
+                       "text/plain"))
                  "\n")
          (insert "Content-ID: " (message-make-message-id) "\n")
          (insert "Content-Transfer-Encoding: "