comparison lisp/gnus/mml.el @ 49598:0d8b17d428b5

Trailing whitepace deleted.

49597:e88404e8f2cf

  (autoload 'message-posting-charset "message"))

(defvar mml-generate-multipart-alist nil
  "*Alist of multipart generation functions.
Each entry has the form (NAME . FUNCTION), where
NAME is a string containing the name of the part (without the 
leading \"/multipart/\"),
FUNCTION is a Lisp function which is called to generate the part.

The Lisp function has to supply the appropriate MIME headers and the
contents of this part.")

with unknown encoding; `multipart': always send messages with more than
one charsets.")

(defvar mml-generate-mime-preprocess-function nil
  "A function called before generating a mime part.
The function is called with one parameter, which is the part to be 
generated.")

(defvar mml-generate-mime-postprocess-function nil
  "A function called after generating a mime part.
The function is called with one parameter, which is the generated part.")

(defvar mml-generate-default-type "text/plain")

(defvar mml-buffer-list nil)

(defun mml-generate-new-buffer (name) 
  (let ((buf (generate-new-buffer name)))
    (push buf mml-buffer-list)
    buf))

(defun mml-destroy-buffers ()

		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)
		  (prog1 (y-or-n-p
			  "\
Message contains characters with unknown encoding.  Really send?")
		    (set (make-local-variable 'mml-confirmation-set)
			 (push 'unknown-encoding mml-confirmation-set))))
	      (if (setq use-ascii 
			(or (memq 'use-ascii mml-confirmation-set)
			    (y-or-n-p "Use ASCII as charset?")))
		  (setq charsets (delq nil charsets))
		(setq warn nil))
	    (error "Edit your message to remove those characters")))

	    (setq struct (nconc nstruct struct)))))))
    (unless (eobp)
      (forward-line 1))
    (nreverse struct)))

(defun mml-parse-singlepart-with-multiple-charsets 
  (orig-tag beg end &optional use-ascii)
  (save-excursion
    (save-restriction
      (narrow-to-region beg end)
      (goto-char (point-min))

	(progn
	  (while (and (> count 0) (not (eobp)))
	    (if (re-search-forward "<#\\(/\\)?mml." nil t)
		(setq count (+ count (if (match-beginning 1) -1 1)))
	      (goto-char (point-max))))
	  (buffer-substring-no-properties beg (if (> count 0) 
						  (point)
						(match-beginning 0))))
      (if (re-search-forward
	   "<#\\(/\\)?\\(multipart\\|part\\|external\\|mml\\)." nil t)
	  (prog1

		    (goto-char (point-min))
		    (while (re-search-forward
			    "<#!+/?\\(part\\|multipart\\|external\\|mml\\)" nil t)
		      (delete-region (+ (match-beginning 0) 2)
				     (+ (match-beginning 0) 3))))))
		(cond 
		 ((eq (car cont) 'mml)
		  (let ((mml-boundary (funcall mml-boundary-function
					       (incf mml-multipart-number)))
			(mml-generate-default-type "text/plain"))
		    (mml-to-mime))

		    (setq encoding (mm-body-7-or-8))))
		 ((string= (car (split-string type "/")) "message")
		  (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))))
		 (t 
		  (setq charset (mm-encode-body))
		  (setq encoding (mm-body-encoding
				  charset (cdr (assq 'encoding cont))))))
		(setq coded (buffer-string)))
	      (mml-insert-mime-headers cont type charset encoding)

    (unless (stringp (car handle))
      (unless (setq textp (equal (mm-handle-media-supertype handle) "text"))
	(save-excursion
	  (set-buffer (setq buffer (mml-generate-new-buffer " *mml*")))
	  (mm-insert-part handle)
	  (if (setq mmlp (equal (mm-handle-media-type handle) 
				"message/rfc822"))
	      (mime-to-mml)))))
    (if mmlp
	(mml-insert-mml-markup handle nil t t)
      (unless (and no-markup
		   (equal (mm-handle-media-type handle) "text/plain"))
	(mml-insert-mml-markup handle buffer textp)))
    (cond
     (mmlp 
      (insert-buffer buffer)
      (goto-char (point-max))
      (insert "<#/mml>\n"))
     ((stringp (car handle))
      (mapcar 'mml-insert-mime (cdr handle))

(defun mml-preview (&optional raw)
  "Display current buffer with Gnus, in a new buffer.
If RAW, don't highlight the article."
  (interactive "P")
  (let ((buf (current-buffer))
	(message-posting-charset (or (gnus-setup-posting-charset 
				      (save-restriction
					(message-narrow-to-headers-or-head)
					(message-fetch-field "Newsgroups")))
				     message-posting-charset)))
    (switch-to-buffer (get-buffer-create 
		       (concat (if raw "*Raw MIME preview of "
				 "*MIME preview of ") (buffer-name))))
    (erase-buffer)
    (insert-buffer buf)
    (if (re-search-forward

49598:0d8b17d428b5

  (autoload 'message-posting-charset "message"))

(defvar mml-generate-multipart-alist nil
  "*Alist of multipart generation functions.
Each entry has the form (NAME . FUNCTION), where
NAME is a string containing the name of the part (without the
leading \"/multipart/\"),
FUNCTION is a Lisp function which is called to generate the part.

The Lisp function has to supply the appropriate MIME headers and the
contents of this part.")

with unknown encoding; `multipart': always send messages with more than
one charsets.")

(defvar mml-generate-mime-preprocess-function nil
  "A function called before generating a mime part.
The function is called with one parameter, which is the part to be
generated.")

(defvar mml-generate-mime-postprocess-function nil
  "A function called after generating a mime part.
The function is called with one parameter, which is the generated part.")

(defvar mml-generate-default-type "text/plain")

(defvar mml-buffer-list nil)

(defun mml-generate-new-buffer (name)
  (let ((buf (generate-new-buffer name)))
    (push buf mml-buffer-list)
    buf))

(defun mml-destroy-buffers ()

		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)
		  (prog1 (y-or-n-p
			  "\
Message contains characters with unknown encoding.  Really send?")
		    (set (make-local-variable 'mml-confirmation-set)
			 (push 'unknown-encoding mml-confirmation-set))))
	      (if (setq use-ascii
			(or (memq 'use-ascii mml-confirmation-set)
			    (y-or-n-p "Use ASCII as charset?")))
		  (setq charsets (delq nil charsets))
		(setq warn nil))
	    (error "Edit your message to remove those characters")))

	    (setq struct (nconc nstruct struct)))))))
    (unless (eobp)
      (forward-line 1))
    (nreverse struct)))

(defun mml-parse-singlepart-with-multiple-charsets
  (orig-tag beg end &optional use-ascii)
  (save-excursion
    (save-restriction
      (narrow-to-region beg end)
      (goto-char (point-min))

	(progn
	  (while (and (> count 0) (not (eobp)))
	    (if (re-search-forward "<#\\(/\\)?mml." nil t)
		(setq count (+ count (if (match-beginning 1) -1 1)))
	      (goto-char (point-max))))
	  (buffer-substring-no-properties beg (if (> count 0)
						  (point)
						(match-beginning 0))))
      (if (re-search-forward
	   "<#\\(/\\)?\\(multipart\\|part\\|external\\|mml\\)." nil t)
	  (prog1

		    (goto-char (point-min))
		    (while (re-search-forward
			    "<#!+/?\\(part\\|multipart\\|external\\|mml\\)" nil t)
		      (delete-region (+ (match-beginning 0) 2)
				     (+ (match-beginning 0) 3))))))
		(cond
		 ((eq (car cont) 'mml)
		  (let ((mml-boundary (funcall mml-boundary-function
					       (incf mml-multipart-number)))
			(mml-generate-default-type "text/plain"))
		    (mml-to-mime))

		    (setq encoding (mm-body-7-or-8))))
		 ((string= (car (split-string type "/")) "message")
		  (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))))
		 (t
		  (setq charset (mm-encode-body))
		  (setq encoding (mm-body-encoding
				  charset (cdr (assq 'encoding cont))))))
		(setq coded (buffer-string)))
	      (mml-insert-mime-headers cont type charset encoding)

    (unless (stringp (car handle))
      (unless (setq textp (equal (mm-handle-media-supertype handle) "text"))
	(save-excursion
	  (set-buffer (setq buffer (mml-generate-new-buffer " *mml*")))
	  (mm-insert-part handle)
	  (if (setq mmlp (equal (mm-handle-media-type handle)
				"message/rfc822"))
	      (mime-to-mml)))))
    (if mmlp
	(mml-insert-mml-markup handle nil t t)
      (unless (and no-markup
		   (equal (mm-handle-media-type handle) "text/plain"))
	(mml-insert-mml-markup handle buffer textp)))
    (cond
     (mmlp
      (insert-buffer buffer)
      (goto-char (point-max))
      (insert "<#/mml>\n"))
     ((stringp (car handle))
      (mapcar 'mml-insert-mime (cdr handle))

(defun mml-preview (&optional raw)
  "Display current buffer with Gnus, in a new buffer.
If RAW, don't highlight the article."
  (interactive "P")
  (let ((buf (current-buffer))
	(message-posting-charset (or (gnus-setup-posting-charset
				      (save-restriction
					(message-narrow-to-headers-or-head)
					(message-fetch-field "Newsgroups")))
				     message-posting-charset)))
    (switch-to-buffer (get-buffer-create
		       (concat (if raw "*Raw MIME preview of "
				 "*MIME preview of ") (buffer-name))))
    (erase-buffer)
    (insert-buffer buf)
    (if (re-search-forward