emacs: lisp/gnus/mml.el comparison

comparison lisp/gnus/mml.el @ 90223:edf295560b5a

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-77 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 504-513) - Update from CVS - Merge from gnus--rel--5.10 - Update from CVS: .cvsignore: Add `lock'. * gnus--rel--5.10 (patch 99-103) - Update from CVS

author	Miles Bader <miles@gnu.org>
date	Fri, 05 Aug 2005 10:57:36 +0000
parents	187d6a1f84f7 4db92b217e85
children	2d92f5c9d6ae

comparison

equal deleted inserted replaced

-:709f27353024
+:edf295560b5a
 `unknown-encoding': always send messages contain characters with
 unknown encoding; `use-ascii': always use ASCII for those characters
 with unknown encoding; `multipart': always send messages with more than
 one charsets.")
-(defvar mml-generate-default-type "text/plain")
+(defvar mml-generate-default-type "text/plain"
+"Content type by which the Content-Type header can be omitted.
+The Content-Type header will not be put in the MIME part if the type
+equals the value and there's no parameter (e.g. charset, format, etc.)
+and `mml-insert-mime-headers-always' is nil.  The value will be bound
+to \"message/rfc822\" when encoding an article to be forwarded as a MIME
+part.  This is for the internal use, you should never modify the value.")
 (defvar mml-buffer-list nil)
 (defun mml-generate-new-buffer (name)
 (let ((buf (generate-new-buffer name)))
 (save-restriction
 (narrow-to-region (point) (point))
 (mml-tweak-part cont)
 (cond
 ((or (eq (car cont) 'part) (eq (car cont) 'mml))
-	(let ((raw (cdr (assq 'raw cont)))
+	(let* ((raw (cdr (assq 'raw cont)))
-	      coded encoding charset filename type flowed)
+	       (filename (cdr (assq 'filename cont)))
-	  (setq type (or (cdr (assq 'type cont)) "text/plain"))
+	       (type (or (cdr (assq 'type cont))
+			 (if filename
+			     (or (mm-default-file-encoding filename)
+				 "application/octet-stream")
+			   "text/plain")))
+	       coded encoding charset flowed)
 	  (if (and (not raw)
 		   (member (car (split-string type "/")) '("text" "message")))
 	      (progn
 		(with-temp-buffer
 		  (setq charset (mm-charset-to-coding-system
 		  (when (eq charset 'ascii)
 		    (setq charset nil))
 		  (cond
 		   ((cdr (assq 'buffer cont))
 		    (insert-buffer-substring (cdr (assq 'buffer cont))))
-		   ((and (setq filename (cdr (assq 'filename cont)))
+		   ((and filename
 			 (not (equal (cdr (assq 'nofile cont)) "yes")))
 		    (let ((coding-system-for-read charset))
 		      (mm-insert-file-contents filename)))
 		   ((eq 'mml (car cont))
 		    (insert (cdr (assq 'contents cont))))
 			(delete-region (+ (match-beginning 0) 2)
 				       (+ (match-beginning 0) 3))))))
 		  (cond
 		   ((eq (car cont) 'mml)
 		    (let ((mml-boundary (mml-compute-boundary cont))
+			  ;; It is necessary for the case where this
+			  ;; function is called recursively since
+			  ;; `m-g-d-t' will be bound to "message/rfc822"
+			  ;; when encoding an article to be forwarded.
 			  (mml-generate-default-type "text/plain"))
 		      (mml-to-mime))
 		    (let ((mm-7bit-chars (concat mm-7bit-chars "\x1b")))
 		      ;; ignore 0x1b, it is part of iso-2022-jp
 		      (setq encoding (mm-body-7-or-8))))
 	      (cond
 	       ((cdr (assq 'buffer cont))
 		(insert (with-current-buffer (cdr (assq 'buffer cont))
 			  (mm-with-unibyte-current-buffer
 			    (buffer-string)))))
-	       ((and (setq filename (cdr (assq 'filename cont)))
+	       ((and filename
 		     (not (equal (cdr (assq 'nofile cont)) "yes")))
 		(let ((coding-system-for-read mm-binary-coding-system))
 		  (mm-insert-file-contents filename nil nil nil nil t)))
 	       (t
 		(insert (cdr (assq 'contents cont)))))
 	    (mml-insert-parameter
 	     (mail-header-encode-parameter "url" url)
 	     "access-type=url"))
 	  (when parameters
 	    (mml-insert-parameter-string
-	     cont '(expiration size permission))))
+	     cont '(expiration size permission)))
-	(insert "\n\n")
+	  (insert "\n\n")
-	(insert "Content-Type: " (cdr (assq 'type cont)) "\n")
+	  (insert "Content-Type: "
-	(insert "Content-ID: " (message-make-message-id) "\n")
+		  (or (cdr (assq 'type cont))
-	(insert "Content-Transfer-Encoding: "
+		      (if name
-		(or (cdr (assq 'encoding cont)) "binary"))
+			  (or (mm-default-file-encoding name)
-	(insert "\n\n")
+			      "application/octet-stream")
-	(insert (or (cdr (assq 'contents cont))))
+			"text/plain"))
-	(insert "\n"))
+		  "\n")
+	  (insert "Content-ID: " (message-make-message-id) "\n")
+	  (insert "Content-Transfer-Encoding: "
+		  (or (cdr (assq 'encoding cont)) "binary"))
+	  (insert "\n\n")
+	  (insert (or (cdr (assq 'contents cont))))
+	  (insert "\n")))
 ((eq (car cont) 'multipart)
 	(let* ((type (or (cdr (assq 'type cont)) "mixed"))
 	       (mml-generate-default-type (if (equal type "digest")
 					      "message/rfc822"
 					    "text/plain"))
 	  (when (setq sender (cdr (assq 'sender cont)))
 	    (message-options-set 'mml-sender sender)
 	    (message-options-set 'message-sender sender))
 	  (if (setq recipients (cdr (assq 'recipients cont)))
 	      (message-options-set 'message-recipients recipients))
-	  (let ((style (mml-signencrypt-style (first (or sign-item encrypt-item)))))
+	  (let ((style (mml-signencrypt-style
+			(first (or sign-item encrypt-item)))))
 	    ;; check if: we're both signing & encrypting, both methods
 	    ;; are the same (why would they be different?!), and that
 	    ;; the signencrypt style allows for combined operation.
 	    (if (and sign-item encrypt-item (equal (first sign-item)
 						   (first encrypt-item))

Mercurial > emacs

comparison lisp/gnus/mml.el @ 90223:edf295560b5a