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

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

diff --git a/lisp/nneething.el b/lisp/nneething.el
index 61e8276..7da5466 100644 (file)
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -45,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.
@@ -73,6 +68,8 @@ included.")
 
 \f
 
+(autoload 'gnus-encode-coding-string "gnus-ems")
+
 ;;; Interface functions.
 
 (nnoo-define-basics nneething)
@@ -216,16 +213,6 @@ 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)
@@ -256,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 '")
@@ -329,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))
@@ -357,13 +344,10 @@ included.")
 
 (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)))
-           (concat dir fname)
-         (make-temp-name (concat dir "nneething")))
-      (concat dir article))))
+  (concat (file-name-as-directory nneething-address)
+         (if (numberp article)
+             (cadr (assq article nneething-map))
+           article)))
 
 (provide 'nneething)