From b96e999691d278057d381c16665991beff1f2488 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Mon, 17 Apr 2006 16:12:08 +0000 Subject: [PATCH] (message-forward-make-body-plain): Allow message-forward-ignored-headers to be a list. (message-remove-ignored-headers): Factor out into function. (message-forward-make-body-mml): Use it. --- lisp/ChangeLog | 5 +++++ lisp/message.el | 28 +++++++++++++++------------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c851d804a..db7615c7b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,10 @@ 2006-04-17 Lars Magne Ingebrigtsen + * message.el (message-forward-make-body-plain): Allow + message-forward-ignored-headers to be a list. + (message-remove-ignored-headers): Factor out into function. + (message-forward-make-body-mml): Use it. + * imap.el (imap-quote-specials): New function. (imap-login-auth): Quote specials. diff --git a/lisp/message.el b/lisp/message.el index 1b3f0dc48..81bd981e8 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -6381,13 +6381,20 @@ Optional DIGEST will use digest to forward." (setq e (point)) (insert "\n-------------------- End of forwarded message --------------------\n") - (when message-forward-ignored-headers - (save-restriction - (narrow-to-region b e) - (goto-char b) - (narrow-to-region (point) - (or (search-forward "\n\n" nil t) (point))) - (message-remove-header message-forward-ignored-headers t))))) + (message-remove-ignored-headers b e))) + +(defun message-remove-ignored-headers (b e) + (when message-forward-ignored-headers + (save-restriction + (narrow-to-region b e) + (goto-char b) + (narrow-to-region (point) + (or (search-forward "\n\n" nil t) (point))) + (let ((ignored (if (stringp message-forward-ignored-headers) + (list message-forward-ignored-headers) + message-forward-ignored-headers))) + (dolist (elem ignored) + (message-remove-header elem t)))))) (defun message-forward-make-body-mime (forward-buffer) (insert "\n\n<#part type=message/rfc822 disposition=inline raw=t>\n") @@ -6429,12 +6436,7 @@ Optional DIGEST will use digest to forward." (insert "<#/mml>\n") (when (and (not message-forward-decoded-p) message-forward-ignored-headers) - (save-restriction - (narrow-to-region b e) - (goto-char b) - (narrow-to-region (point) - (or (search-forward "\n\n" nil t) (point))) - (message-remove-header message-forward-ignored-headers t))))) + (message-remove-ignored-headers b e)))) (defun message-forward-make-body-digest-plain (forward-buffer) (insert -- 2.25.1