*** empty log message ***

[gnus] / lisp / nnspool.el

diff --git a/lisp/nnspool.el b/lisp/nnspool.el
index 21f10f8..50ad88a 100644 (file)
--- a/lisp/nnspool.el
+++ b/lisp/nnspool.el
@@ -1,5 +1,5 @@
 ;;; nnspool.el --- spool access for GNU Emacs
-;; Copyright (C) 1988,89,90,93,94,95,96 Free Software Foundation, Inc.
+;; Copyright (C) 1988,89,90,93,94,95,96,97 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;     Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
@@ -320,9 +320,8 @@ there.")
        (process-send-region proc (point-min) (point-max))
        ;; We slap a condition-case around this, because the process may
        ;; have exited already...
-       (condition-case nil
-           (process-send-eof proc)
-         (error nil))
+       (ignore-errors
+         (process-send-eof proc))
        t))))
 
 
@@ -358,37 +357,34 @@ there.")
          (erase-buffer)
          (if nnspool-sift-nov-with-sed
              (nnspool-sift-nov-with-sed articles nov)
-           (insert-file-contents nov)
+           (nnheader-insert-file-contents nov)
            (if (and fetch-old
                     (not (numberp fetch-old)))
                t                       ; We want all the headers.
-             (condition-case ()
-                 (progn
-                   ;; Delete unwanted NOV lines.
-                   (nnheader-nov-delete-outside-range
-                    (if fetch-old (max 1 (- (car articles) fetch-old))
-                      (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.  
-                     ;; The NOV file may be out of sync with the articles
-                     ;; in the group.
-                     (forward-line -1)
-                     (setq last (read (current-buffer)))
-                     (if (= last (car articles))
-                         ;; Yup, it's all there.
-                         t
-                       ;; Perhaps not.  We try to find the missing articles.
-                       (while (and arts
-                                   (<= last (car arts)))
-                         (pop arts))
-                       ;; The articles in `arts' are missing from the buffer.
-                       (while arts
-                         (nnspool-insert-nov-head (pop arts)))
-                       t)))
-               ;; The NOV file was corrupted.
-               (error nil)))))))))
+             (ignore-errors
+               ;; Delete unwanted NOV lines.
+               (nnheader-nov-delete-outside-range
+                (if fetch-old (max 1 (- (car articles) fetch-old))
+                  (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.  
+                 ;; The NOV file may be out of sync with the articles
+                 ;; in the group.
+                 (forward-line -1)
+                 (setq last (read (current-buffer)))
+                 (if (= last (car articles))
+                     ;; Yup, it's all there.
+                     t
+                   ;; Perhaps not.  We try to find the missing articles.
+                   (while (and arts
+                               (<= last (car arts)))
+                     (pop arts))
+                   ;; The articles in `arts' are missing from the buffer.
+                   (while arts
+                     (nnspool-insert-nov-head (pop arts)))
+                   t))))))))))
 
 (defun nnspool-insert-nov-head (article)
   "Read the head of ARTICLE, convert to NOV headers, and insert."
@@ -421,9 +417,8 @@ there.")
     (set-buffer (get-buffer-create " *nnspool work*"))
     (buffer-disable-undo (current-buffer))
     (erase-buffer)
-    (condition-case ()
-       (call-process "grep" nil t nil (regexp-quote id) nnspool-history-file)
-      (error nil))
+    (ignore-errors
+      (call-process "grep" nil t nil (regexp-quote id) nnspool-history-file))
     (goto-char (point-min))
     (prog1
        (when (looking-at "<[^>]+>[ \t]+[-0-9~]+[ \t]+\\([^ /\t\n]+\\)/\\([0-9]+\\)[ \t\n]")
@@ -435,7 +430,7 @@ there.")
   (set-buffer nntp-server-buffer)
   (erase-buffer)
   (condition-case ()
-      (progn (nnheader-insert-file-contents-literally file) t)
+      (progn (nnheader-insert-file-contents file) t)
     (file-error nil)))
 
 (defun nnspool-possibly-change-directory (group)