*** empty log message ***

[gnus] / lisp / nneething.el

diff --git a/lisp/nneething.el b/lisp/nneething.el
index 691c84f..8b839b9 100644 (file)
--- a/lisp/nneething.el
+++ b/lisp/nneething.el
@@ -33,7 +33,8 @@
 (require 'nnheader)
 (require 'nnmail)
 (require 'nnoo)
-(eval-when-compile (require 'cl))
+(require 'gnus-util)
+(require 'cl)
 
 (nnoo-declare nneething)
 
@@ -95,7 +96,7 @@ If this variable is nil, no files will be excluded.")
 
          (when (and (file-exists-p file)
                     (or (file-directory-p file)
-                        (not (zerop (nth 7 (file-attributes file))))))
+                        (not (zerop (nnheader-file-size file)))))
            (insert (format "221 %d Article retrieved.\n" article))
            (nneething-insert-head file)
            (insert ".\n"))
@@ -180,8 +181,7 @@ If this variable is nil, no files will be excluded.")
 
 (defun nneething-map-file ()
   ;; We make sure that the .nneething directory exists. 
-  (unless (file-exists-p nneething-map-file-directory)
-    (make-directory nneething-map-file-directory 'parents))
+  (gnus-make-directory nneething-map-file-directory)
   ;; We store it in a special directory under the user's home dir.
   (concat (file-name-as-directory nneething-map-file-directory)
          nneething-group nneething-map-file))
@@ -245,13 +245,12 @@ If this variable is nil, no files will be excluded.")
       (setq files (cdr files)))
     (when (and touched 
               (not nneething-read-only))
-      (save-excursion
-       (nnheader-set-temp-buffer " *nneething map*")
-       (insert "(setq nneething-map '" (prin1-to-string nneething-map) ")\n"
-               "(setq nneething-active '" (prin1-to-string nneething-active)
-               ")\n")
-       (write-region (point-min) (point-max) map-file nil 'nomesg)
-       (kill-buffer (current-buffer))))))
+      (nnheader-temp-write map-file
+       (insert "(setq nneething-map '")
+       (gnus-prin1 nneething-map)
+       (insert ")\n(setq nneething-active '")
+       (gnus-prin1 nneething-active)
+       (insert ")\n")))))
 
 (defun nneething-insert-head (file)
   "Insert the head of FILE."