[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/gnus/mml.el
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/gnus/mml.el |
Date: |
Fri, 04 Apr 2003 01:22:15 -0500 |
Index: emacs/lisp/gnus/mml.el
diff -c emacs/lisp/gnus/mml.el:1.14 emacs/lisp/gnus/mml.el:1.15
*** emacs/lisp/gnus/mml.el:1.14 Thu Feb 7 10:57:55 2002
--- emacs/lisp/gnus/mml.el Tue Feb 4 08:06:38 2003
***************
*** 39,45 ****
(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.
--- 39,45 ----
(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.
***************
*** 75,81 ****
(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
--- 75,81 ----
(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
***************
*** 86,92 ****
(defvar mml-buffer-list nil)
! (defun mml-generate-new-buffer (name)
(let ((buf (generate-new-buffer name)))
(push buf mml-buffer-list)
buf))
--- 86,92 ----
(defvar mml-buffer-list nil)
! (defun mml-generate-new-buffer (name)
(let ((buf (generate-new-buffer name)))
(push buf mml-buffer-list)
buf))
***************
*** 128,134 ****
(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)
--- 128,134 ----
(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)
***************
*** 137,143 ****
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))
--- 137,143 ----
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))
***************
*** 169,175 ****
(forward-line 1))
(nreverse struct)))
! (defun mml-parse-singlepart-with-multiple-charsets
(orig-tag beg end &optional use-ascii)
(save-excursion
(save-restriction
--- 169,175 ----
(forward-line 1))
(nreverse struct)))
! (defun mml-parse-singlepart-with-multiple-charsets
(orig-tag beg end &optional use-ascii)
(save-excursion
(save-restriction
***************
*** 261,267 ****
(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
--- 261,267 ----
(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
***************
*** 325,331 ****
"<#!+/?\\(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)))
--- 325,331 ----
"<#!+/?\\(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)))
***************
*** 338,344 ****
(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))))))
--- 338,344 ----
(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))))))
***************
*** 579,585 ****
(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
--- 579,585 ----
(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
***************
*** 588,594 ****
(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"))
--- 588,594 ----
(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"))
***************
*** 828,839 ****
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)
--- 828,839 ----
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/gnus/mml.el,
Miles Bader <=