comparison lisp/gnus/mml.el @ 31764:54ae1def18cf

Merge from Gnus trunk.

31763:1d2b57dffb60

	  (setq tag (list 'part '(type . "text/plain"))
		no-markup-p t
		warn t))
	(setq raw (cdr (assq 'raw tag))
	      point (point)
	      contents (if raw
			   (mm-with-unibyte-current-buffer
			     (mml-read-part (eq 'mml (car tag))))
			 (mml-read-part (eq 'mml (car tag))))
	      charsets (if raw nil 
			 (mm-find-mime-charset-region point (point))))
	(when (and (not raw) (memq nil charsets))
	  (if (or (memq 'unknown-encoding mml-confirmation-set)
		  (y-or-n-p

	      (insert (cdr (assq 'contents cont)))))
	    (setq encoding (mm-encode-buffer type)
		  coded (buffer-string))))
	(mml-insert-mime-headers cont type charset encoding)
	(insert "\n")
	(mm-with-unibyte-current-buffer
	  (insert coded))))
     ((eq (car cont) 'external)
      (insert "Content-Type: message/external-body")
      (let ((parameters (mml-parameter-string
			 cont '(expiration size permission)))
	    (name (cdr (assq 'name cont))))

    (if (re-search-forward
	 (concat "^" (regexp-quote mail-header-separator) "\n") nil t)
	(replace-match "\n"))
    (mml-to-mime)
    (if raw
	(mm-disable-multibyte)
      (let ((gnus-newsgroup-charset (car message-posting-charset)))
	(run-hooks 'gnus-article-decode-hook)
	(let ((gnus-newsgroup-name "dummy"))
	  (gnus-article-prepare-display))))
    (fundamental-mode)

31764:54ae1def18cf

	  (setq tag (list 'part '(type . "text/plain"))
		no-markup-p t
		warn t))
	(setq raw (cdr (assq 'raw tag))
	      point (point)
	      contents (mml-read-part (eq 'mml (car tag)))
	      charsets (if raw nil 
			 (mm-find-mime-charset-region point (point))))
	(when (and (not raw) (memq nil charsets))
	  (if (or (memq 'unknown-encoding mml-confirmation-set)
		  (y-or-n-p

	      (insert (cdr (assq 'contents cont)))))
	    (setq encoding (mm-encode-buffer type)
		  coded (buffer-string))))
	(mml-insert-mime-headers cont type charset encoding)
	(insert "\n")
	(insert coded)))
     ((eq (car cont) 'external)
      (insert "Content-Type: message/external-body")
      (let ((parameters (mml-parameter-string
			 cont '(expiration size permission)))
	    (name (cdr (assq 'name cont))))

    (if (re-search-forward
	 (concat "^" (regexp-quote mail-header-separator) "\n") nil t)
	(replace-match "\n"))
    (mml-to-mime)
    (if raw
	(when (fboundp 'set-buffer-multibyte)
	  (let ((s (buffer-string)))
	    ;; Insert the content into unibyte buffer.
	    (erase-buffer)
	    (mm-disable-multibyte)
	    (insert s)))
      (let ((gnus-newsgroup-charset (car message-posting-charset)))
	(run-hooks 'gnus-article-decode-hook)
	(let ((gnus-newsgroup-name "dummy"))
	  (gnus-article-prepare-display))))
    (fundamental-mode)