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

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

diff --git a/lisp/nneething.el b/lisp/nneething.el
index 1d83717..7da5466 100644 (file)
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -1,7 +1,5 @@
 ;;; nneething.el --- arbitrary file access for Gnus
-
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
-;;     Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97,98 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;     Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -47,11 +45,6 @@
   "Regexp saying what files to exclude from the group.
 If this variable is nil, no files will be excluded.")
 
-(defvoo nneething-include-files nil
-  "Regexp saying what files to include in the group.
-If this variable is non-nil, only files matching this regexp will be
-included.")
-
 \f
 
 ;;; Internal variables.
@@ -75,6 +68,8 @@ included.")
 
 \f
 
+(autoload 'gnus-encode-coding-string "gnus-ems")
+
 ;;; Interface functions.
 
 (nnoo-define-basics nneething)
@@ -109,7 +104,7 @@ included.")
          (and large
               (zerop (% count 20))
               (nnheader-message 5 "nneething: Receiving headers... %d%%"
-                                (/ (* count 100) number))))
+                       (/ (* count 100) number))))
 
        (when large
          (nnheader-message 5 "nneething: Receiving headers...done"))
@@ -129,8 +124,7 @@ included.")
           (nnmail-find-file file)      ; Insert the file in the nntp buf.
           (unless (nnheader-article-p) ; Either it's a real article...
             (goto-char (point-min))
-            (nneething-make-head
-             file (current-buffer))    ; ... or we fake some headers.
+            (nneething-make-head file (current-buffer)) ; ... or we fake some headers.
             (insert "\n"))
           t))))
 
@@ -219,27 +213,17 @@ included.")
                  (setq files (cdr files)))
              (setq prev f))
            (setq f (cdr f)))))
-      ;; Remove files not matching the inclusion regexp.
-      (when nneething-include-files
-       (let ((f files)
-             prev)
-         (while f
-           (if (not (string-match nneething-include-files (car f)))
-               (if prev (setcdr prev (cdr f))
-                 (setq files (cdr files)))
-             (setq prev f))
-           (setq f (cdr f)))))
       ;; Remove deleted files from the map.
       (let ((map nneething-map)
            prev)
        (while map
-         (if (and (member (cadr (car map)) files)
+         (if (and (member (cadar map) files)
                   ;; We also remove files that have changed mod times.
                   (equal (nth 5 (file-attributes
-                                 (nneething-file-name (cadr (car map)))))
-                         (cadr (cdar map))))
+                                 (nneething-file-name (cadar map))))
+                         (caddar map)))
              (progn
-               (push (cadr (car map)) map-files)
+               (push (cadar map) map-files)
                (setq prev map))
            (setq touched t)
            (if prev
@@ -259,7 +243,7 @@ included.")
        (setq files (cdr files)))
       (when (and touched
                 (not nneething-read-only))
-       (with-temp-file map-file
+       (nnheader-temp-write map-file
          (insert "(setq nneething-map '")
          (gnus-prin1 nneething-map)
          (insert ")\n(setq nneething-active '")
@@ -272,11 +256,11 @@ included.")
     (insert-buffer-substring nneething-work-buffer)
     (goto-char (point-max))))
 
-(defun nneething-make-head (file &optional buffer extra-msg)
+(defun nneething-make-head (file &optional buffer)
   "Create a head by looking at the file attributes of FILE."
   (let ((atts (file-attributes file)))
     (insert
-     "Subject: " (file-name-nondirectory file) (or extra-msg "") "\n"
+     "Subject: " (file-name-nondirectory file) "\n"
      "Message-ID: <nneething-"
      (int-to-string (incf nneething-message-id-number))
      "@" (system-name) ">\n"
@@ -297,7 +281,8 @@ included.")
           (concat "Lines: " (int-to-string
                              (count-lines (point-min) (point-max)))
                   "\n"))
-       ""))))
+       "")
+     )))
 
 (defun nneething-from-line (uid &optional file)
   "Return a From header based of UID."
@@ -317,8 +302,7 @@ included.")
                       (substring file
                                  (match-beginning 1)
                                  (match-end 1))
-                    (when (string-match
-                           "/\\(users\\|home\\)/\\([^/]+\\)/" file)
+                    (when (string-match "/\\(users\\|home\\)/\\([^/]+\\)/" file)
                       (setq login (substring file
                                              (match-beginning 2)
                                              (match-end 2))
@@ -332,7 +316,7 @@ included.")
   (save-excursion
     (set-buffer (get-buffer-create nneething-work-buffer))
     (setq case-fold-search nil)
-    (buffer-disable-undo)
+    (buffer-disable-undo (current-buffer))
     (erase-buffer)
     (cond
      ((not (file-exists-p file))
@@ -344,33 +328,26 @@ included.")
       (nneething-make-head file) t)
      (t
       ;; We examine the file.
-      (condition-case ()
-         (progn
-           (nnheader-insert-head file)
-           (if (nnheader-article-p)
-               (delete-region
-                (progn
-                  (goto-char (point-min))
-                  (or (and (search-forward "\n\n" nil t)
+      (nnheader-insert-head file)
+      (if (nnheader-article-p)
+         (delete-region
+          (progn
+            (goto-char (point-min))
+            (or (and (search-forward "\n\n" nil t)
                      (1- (point)))
-                      (point-max)))
-                (point-max))
-             (goto-char (point-min))
-             (nneething-make-head file (current-buffer))
-             (delete-region (point) (point-max))))
-       (file-error
-        (nneething-make-head file (current-buffer) " (unreadable)")))
+                (point-max)))
+          (point-max))
+       (goto-char (point-min))
+       (nneething-make-head file (current-buffer))
+       (delete-region (point) (point-max)))
       t))))
 
 (defun nneething-file-name (article)
   "Return the file name of ARTICLE."
-  (let ((dir (file-name-as-directory nneething-address))
-        fname)
-    (if (numberp article)
-       (if (setq fname (cadr (assq article nneething-map)))
-           (expand-file-name fname dir)
-         (make-temp-name (expand-file-name "nneething" dir)))
-      (expand-file-name article dir))))
+  (concat (file-name-as-directory nneething-address)
+         (if (numberp article)
+             (cadr (assq article nneething-map))
+           article)))
 
 (provide 'nneething)