Synch up to Semi-gnus 6.7.2.

diff --git a/lisp/nnagent.el b/lisp/nnagent.el
index 90667cb..b42ddf9 100644 (file)
--- a/lisp/nnagent.el
+++ b/lisp/nnagent.el
@@ -27,7 +27,7 @@
 
 (require 'nnheader)
 (require 'nnoo)
-(require 'cl)
+(eval-when-compile (require 'cl))
 (require 'gnus-agent)
 (require 'nnml)
 

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 334b2b6..5f399d8 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -31,7 +31,7 @@
 (require 'message)
 (require 'nnmail)
 (require 'nnoo)
-(require 'cl)
+(eval-when-compile (require 'cl))
 (require 'gnus-util)
 
 (nnoo-declare nnfolder)
@@ -397,14 +397,16 @@ time saver for large mailboxes.")
   (save-excursion
     (set-buffer buffer)
     (goto-char (point-min))
-    (when (looking-at "X-From-Line: ")
-      (replace-match "From "))
+    (if (looking-at "X-From-Line: ")
+       (replace-match "From ")
+      (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))
     (if (not (nnfolder-goto-article article))
        nil
-      (nnfolder-delete-mail t)
+      (nnfolder-delete-mail)
       (insert-buffer-substring buffer)
       (nnfolder-save-buffer)
       t)))

diff --git a/lisp/nngateway.el b/lisp/nngateway.el
index 168d5f4..6b59be5 100644 (file)
--- a/lisp/nngateway.el
+++ b/lisp/nngateway.el
@@ -62,7 +62,8 @@ parameter -- the gateway address.")
        (insert mail-header-separator "\n")
        (widen)
        (let (message-required-mail-headers)
-         (funcall message-send-mail-function))))))
+         (funcall message-send-mail-function))
+       t))))
 
 ;;; Internal functions
 

diff --git a/lisp/nnheader.el b/lisp/nnheader.el
index cffbedb..e0de0a4 100644 (file)
--- a/lisp/nnheader.el
+++ b/lisp/nnheader.el
@@ -773,7 +773,9 @@ find-file-hooks, etc.
   (let ((format-alist nil)
        (auto-mode-alist (nnheader-auto-mode-alist))
        (default-major-mode 'fundamental-mode)
+       (enable-local-variables nil)
         (after-insert-file-functions nil)
+       (find-file-hooks nil)
        (coding-system-for-read nnheader-file-coding-system))
     (insert-file-contents filename visit beg end replace)))
 

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 7880e2f..5ae4d74 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -25,7 +25,7 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
+(require 'cl)
 
 (require 'nnheader)
 (require 'timezone)