(message-cite-original): Respect X-No-Archive.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5eeb718..8b1c0f7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-cite-original): Respect X-No-Archive. 
+
 2004-06-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (article-hide-headers): Refer to the values for

diff --git a/lisp/message.el b/lisp/message.el
index a5e5442..ceab6bd 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3238,6 +3238,7 @@ prefix, and don't delete any headers."
       (run-hooks 'mail-citation-hook)
     (let* ((start (point))
           (end (mark t))
+          (x-no-archive nil)
           (functions
            (when message-indent-citation-function
              (if (listp message-indent-citation-function)
@@ -3250,6 +3251,7 @@ prefix, and don't delete any headers."
            (save-restriction
              (narrow-to-region start end)
              (message-narrow-to-head-1)
+             (setq x-no-archive (message-fetch-field "x-no-archive"))
              (vector 0
                      (or (message-fetch-field "subject") "none")
                      (message-fetch-field "from")
@@ -3264,7 +3266,13 @@ prefix, and don't delete any headers."
       (when message-citation-line-function
        (unless (bolp)
          (insert "\n"))
-       (funcall message-citation-line-function)))))
+       (funcall message-citation-line-function))
+      (when (and x-no-archive
+                (string-match "yes" x-no-archive))
+       (undo-boundary)
+       (delete-region (point) (mark t))
+       (insert "> [Quoted text removed due to X-No-Archive]\n")
+       (forward-line -1)))))
 
 (defun message-insert-citation-line ()
   "Insert a simple citation line."