*** empty log message ***

[gnus] / lisp / nnspool.el

diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index 9574b5a..0c2e08d 100644 (file)
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -57,7 +57,7 @@ If you are using Cnews, you probably should set this variable to nil.")
 (defvoo nnspool-newsgroups-file (concat nnspool-lib-dir "newsgroups")
   "Local news newsgroups file.")
 
-(defvoo nnspool-distributions-file (concat nnspool-lib-dir "distributions")
+(defvoo nnspool-distributions-file (concat nnspool-lib-dir "distribs.pat")
   "Local news distributions file.")
 
 (defvoo nnspool-history-file (concat nnspool-lib-dir "history")
@@ -162,6 +162,9 @@ there.")
           (file-truename nnspool-spool-directory))))
     (nnspool-close-server)
     (nnheader-report 'nnspool "Not a directory: %s" nnspool-spool-directory))
+   ((not (file-exists-p nnspool-active-file))
+    (nnheader-report 'nnspool "The active file doesn't exist: %s" 
+                    nnspool-active-file))
    (t
     (nnheader-report 'nnspool "Opened server %s using directory %s"
                     server nnspool-spool-directory)
@@ -207,7 +210,8 @@ there.")
        (set-buffer nntp-server-buffer)
        (goto-char (point-min))
        (when (search-forward "\n\n" nil t)
-         (delete-region (1- (point)) (point-max)))))
+         (delete-region (1- (point)) (point-max)))
+       (nnheader-fold-continuation-lines)))
     res))
 
 (deffoo nnspool-request-group (group &optional server dont-check)
@@ -278,7 +282,7 @@ there.")
          (while (and (looking-at "\\([^ ]+\\) +[0-9]+ ")
                      (progn
                        ;; We insert a .0 to make the list reader
-                       ;; interpret the number as a float. It is far
+                       ;; interpret the number as a float.  It is far
                        ;; too big to be stored in a lisp integer. 
                        (goto-char (1- (match-end 0)))
                        (insert ".0")
@@ -360,18 +364,11 @@ there.")
                t                       ; We want all the headers.
              (condition-case ()
                  (progn
-                   ;; First we find the first wanted line.
-                   (nnspool-find-nov-line
+                   ;; Delete unwanted NOV lines.
+                   (nnheader-nov-delete-outside-range
                     (if fetch-old (max 1 (- (car articles) fetch-old))
-                      (car articles)))
-                   (delete-region (point-min) (point))
-                   ;; Then we find the last wanted line. 
-                   (if (nnspool-find-nov-line 
-                        (progn (while (cdr articles)
-                                 (setq articles (cdr articles)))
-                               (car articles)))
-                       (forward-line 1))
-                   (delete-region (point) (point-max))
+                      (car articles))
+                    (car (last articles)))
                    ;; If the buffer is empty, this wasn't very successful.
                    (unless (zerop (buffer-size))
                      ;; We check what the last article number was.  
@@ -408,42 +405,6 @@ there.")
          (nnheader-insert-nov headers)))
       (kill-buffer buf))))
 
-(defun nnspool-find-nov-line (article)
-  (let ((max (point-max))
-       (min (goto-char (point-min)))
-       (cur (current-buffer))
-       (prev (point-min))
-       num found)
-    (while (not found)
-      (goto-char (/ (+ max min) 2))
-      (beginning-of-line)
-      (if (or (= (point) prev)
-             (eobp))
-         (setq found t)
-       (setq prev (point))
-       (cond ((> (setq num (read cur)) article)
-              (setq max (point)))
-             ((< num article)
-              (setq min (point)))
-             (t
-              (setq found 'yes)))))
-    ;; Now we may have found the article we're looking for, or we
-    ;; may be somewhere near it.
-    (when (and (not (eq found 'yes))
-              (not (eq num article)))
-      (setq found (point))
-      (while (and (< (point) max)
-                 (or (not (numberp num))
-                     (< num article)))
-       (forward-line 1)
-       (setq found (point))
-       (or (eobp)
-           (= (setq num (read cur)) article)))
-      (unless (eq num article)
-       (goto-char found)))
-    (beginning-of-line)
-    (eq num article)))
-    
 (defun nnspool-sift-nov-with-sed (articles file)
   (let ((first (car articles))
        (last (progn (while (cdr articles) (setq articles (cdr articles)))
@@ -461,7 +422,7 @@ there.")
     (buffer-disable-undo (current-buffer))
     (erase-buffer)
     (condition-case ()
-       (call-process "grep" nil t nil id nnspool-history-file)
+       (call-process "grep" nil t nil (regexp-quote id) nnspool-history-file)
       (error nil))
     (goto-char (point-min))
     (prog1