This commit was generated by cvs2svn to compensate for changes in r6064,

[elisp/gnus.git-] / lisp / nnfolder.el

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 5f399d8..db9666b 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -397,10 +397,15 @@ time saver for large mailboxes.")
   (save-excursion
     (set-buffer buffer)
     (goto-char (point-min))
-    (if (looking-at "X-From-Line: ")
-       (replace-match "From ")
-      (unless (looking-at message-unix-mail-delimiter)
-       (insert "From nobody " (current-time-string) "\n")))
+    (let (xfrom)
+      (while (re-search-forward "^X-From-Line: \\(.*\\)$" nil t)
+       (setq xfrom (match-string 1))
+       (gnus-delete-line))
+      (goto-char (point-min))
+      (if xfrom
+         (insert "From " xfrom "\n")
+       (unless (looking-at message-unix-mail-delimiter)
+         (insert "From nobody " (current-time-string) "\n"))))
     (nnfolder-normalize-buffer)
     (set-buffer nnfolder-current-buffer)
     (goto-char (point-min))