Synch with Oort Gnus.

* nnheader.el (nnheader-unfold-fws): New function copied from
 `ietf-drums-unfold-fws'.
(ietf-drums-unfold-fws): Alias to `nnheader-unfold-fws'.

diff --git a/ChangeLog b/ChangeLog
index a82e9cb..6bb319a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-30  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lisp/nnheader.el (nnheader-unfold-fws): New function copied from
+       `ietf-drums-unfold-fws'.
+       (ietf-drums-unfold-fws): Alias to `nnheader-unfold-fws'.
+
 2002-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * lisp/gnus-vers.el: T-gnus 6.15.7 revision 00.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bedfe26..09aba95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-05-30  Kai Gro\e,b_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-msg.el (gnus-inews-yank-articles): Merge split header lines
+       so that code reading them won't be surprised.  From Jesper Harder
+       <harder@ifa.au.dk>.
+
 2002-05-29  Simon Josefsson  <jas@extundo.com>
 
        * gnus-sum.el (gnus-summary-delete-article): Agent expire deleted

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index ab401fe..89b2ddd 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -705,8 +705,10 @@ yanked."
            (message-reply-headers
             ;; The headers are decoded.
             (with-current-buffer gnus-article-copy
-              (nnheader-fold-continuation-lines)
-              (nnheader-parse-head t))))
+              (save-restriction
+                (nnheader-narrow-to-headers)
+                (ietf-drums-unfold-fws)
+                (nnheader-parse-head t)))))
        (message-yank-original)
        (setq beg (or beg (mark t))))
       (when articles

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index b6ca95c..c929b84 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -458,6 +458,18 @@ given, the return value will not contain the last newline."
 
   (defalias 'mail-header-field-value 'std11-field-value))
 
+;; ietf-drums stuff.
+(unless (featurep 'ietf-drums)
+  ;; Should keep track of `ietf-drums-unfold-fws' in ietf-drums.el.
+  (defun nnheader-unfold-fws ()
+    "Unfold folding white space in the current buffer."
+    (goto-char (point-min))
+    (while (re-search-forward "[ \t]*\n[ \t]+" nil t)
+      (replace-match " " t t))
+    (goto-char (point-min)))
+
+  (defalias 'ietf-drums-unfold-fws 'nnheader-unfold-fws))
+
 ;;; Header access macros.
 
 ;; These macros may look very much like the ones in GNUS 4.1.  They