*** empty log message ***

[gnus] / lisp / nnfolder.el

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 3045284..db9666b 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -2,7 +2,7 @@
 ;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
 
 ;; Author: Scott Byer <byer@mv.us.adobe.com>
-;;     Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
+;;     Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;; Keywords: mail
 
@@ -31,7 +31,7 @@
 (require 'message)
 (require 'nnmail)
 (require 'nnoo)
-(require 'cl)
+(eval-when-compile (require 'cl))
 (require 'gnus-util)
 
 (nnoo-declare nnfolder)
@@ -396,12 +396,22 @@ time saver for large mailboxes.")
   (nnfolder-possibly-change-group group)
   (save-excursion
     (set-buffer buffer)
+    (goto-char (point-min))
+    (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))
     (if (not (nnfolder-goto-article article))
        nil
-      (nnfolder-delete-mail t t)
+      (nnfolder-delete-mail)
       (insert-buffer-substring buffer)
       (nnfolder-save-buffer)
       t)))
@@ -463,10 +473,9 @@ time saver for large mailboxes.")
       (goto-char (point-min))
       (while (and (search-forward marker nil t)
                  (re-search-forward number nil t))
-       (setq activemin (min activemin
-                            (string-to-number (buffer-substring
-                                               (match-beginning 0)
-                                               (match-end 0))))))
+       (let ((newnum (string-to-number (match-string 0))))
+         (if (nnmail-within-headers-p)
+             (setq activemin (min activemin newnum)))))
       (setcar active activemin))))
 
 (defun nnfolder-article-string (article)
@@ -476,37 +485,43 @@ time saver for large mailboxes.")
 
 (defun nnfolder-goto-article (article)
   "Place point at the start of the headers of ARTICLE.
-ARTICLE can be an article number or a Message-ID."
+ARTICLE can be an article number or a Message-ID.
+Returns t if successful, nil otherwise."
   (let ((art-string (nnfolder-article-string article))
-       end-search end)
-    (while (not end-search)
-      (if (or (search-forward art-string nil t)
-             ;; Don't search the whole file twice!  Also, articles
-             ;; probably have some locality by number, so searching
-             ;; backwards will be faster.  Especially if we're at the
-             ;; beginning of the buffer :-). -SLB
-             (search-backward art-string nil t))
-         (progn
-           (setq end (point))
-           (nnmail-search-unix-mail-delim-backward)
-           (unless (save-excursion (search-forward "\n\n" nil end))
-             (setq end-search 'found)))
-       (setq end-search t)))
-    (eq end-search 'found)))
-
-(defun nnfolder-delete-mail (&optional force leave-delim)
-  "Delete the message that point is in."
-  (save-excursion
-    (delete-region
-     (save-excursion
-       (nnmail-search-unix-mail-delim-backward)
-       (if leave-delim (progn (forward-line 1) (point))
-        (point)))
-     (progn
-       (forward-line 1)
-       (if (nnmail-search-unix-mail-delim)
-          (point)
-        (point-max))))))
+       start found)
+    ;; It is likely that we are at or before the delimiter line.
+    ;; We therefore go to the end of the previous line, and start
+    ;; searching from there.
+    (beginning-of-line)
+    (unless (bobp)
+      (forward-char -1))
+    (setq start (point))
+    ;; First search forward.
+    (while (and (setq found (search-forward art-string nil t))
+               (not (nnmail-within-headers-p))))
+    ;; If unsuccessful, search backward from where we started,
+    (unless found
+      (goto-char start)
+      (while (and (setq found (search-backward art-string nil t))
+                 (not (nnmail-within-headers-p)))))
+    (when found
+      (nnmail-search-unix-mail-delim-backward))))
+
+(defun nnfolder-delete-mail (&optional leave-delim)
+  "Delete the message that point is in.
+If optional argument LEAVE-DELIM is t, then mailbox delimiter is not
+deleted.  Point is left where the deleted region was."
+  (delete-region
+   (save-excursion
+     (forward-line 1) ; in case point is at beginning of message already
+     (nnmail-search-unix-mail-delim-backward)
+     (if leave-delim (progn (forward-line 1) (point))
+       (point)))
+   (progn
+     (forward-line 1)
+     (if (nnmail-search-unix-mail-delim)
+        (point)
+       (point-max)))))
 
 (defun nnfolder-possibly-change-group (group &optional server dont-check)
   ;; Change servers.
@@ -702,8 +717,9 @@ ARTICLE can be an article number or a Message-ID."
            (while (and (search-forward marker nil t)
                        (re-search-forward number nil t))
              (let ((newnum (string-to-number (match-string 0))))
-               (setq maxid (max maxid newnum))
-               (setq minid (min minid newnum))))
+               (if (nnmail-within-headers-p)
+                   (setq maxid (max maxid newnum)
+                         minid (min minid newnum)))))
            (setcar active (max 1 (min minid maxid)))
            (setcdr active (max maxid (cdr active)))
            (goto-char (point-min)))
@@ -777,7 +793,7 @@ ARTICLE can be an article number or a Message-ID."
           (nnfolder-possibly-change-folder file)
           (nnfolder-possibly-change-group file)
           (nnfolder-close-group file))))
-    (message "")))
+    (nnheader-message 5 "")))
 
 (defun nnfolder-group-pathname (group)
   "Make pathname for GROUP."