2001-09-08 16:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	* nnml.el (nnml-marks-changed-p): Typo.
	(nnml-save-marks, nnml-open-marks): Use gnus-sethash.
	(nnml-marks-changed-p): Use gnus-gethash.
	(nnml-marks-modtime): Use gnus-make-hashtable.

	* nnfolder.el (nnfolder-marks-changed-p): Typo.
	(nnfolder-request-expire-articles, nnfolder-save-marks)
	(nnfolder-open-marks): Typo.
	(nnfolder-save-marks, nnfolder-open-marks): Use gnus-sethash.
	(nnfolder-marks-changed-p): Use gnus-gethash.
	(nnfolder-marks-modtime): Use gnus-make-hashtable.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8953994..fe3cf8d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2001-09-08 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * nnml.el (nnml-marks-changed-p): Typo.
+       (nnml-save-marks, nnml-open-marks): Use gnus-sethash.
+       (nnml-marks-changed-p): Use gnus-gethash.
+       (nnml-marks-modtime): Use gnus-make-hashtable.
+
+       * nnfolder.el (nnfolder-marks-changed-p): Typo.
+       (nnfolder-request-expire-articles, nnfolder-save-marks) 
+       (nnfolder-open-marks): Typo.
+       (nnfolder-save-marks, nnfolder-open-marks): Use gnus-sethash.
+       (nnfolder-marks-changed-p): Use gnus-gethash.
+       (nnfolder-marks-modtime): Use gnus-make-hashtable.
+
 2001-09-08  Simon Josefsson  <jas@extundo.com>
 
        * nnfolder.el (nnfolder-marks-modtime): New variable.

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 7edef4e..deb8356 100644 (file)
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -161,7 +161,7 @@ This variable is a virtual server slot.  See the Gnus manual for details.")
 
 (defvoo nnfolder-marks-file-suffix ".mrk")
 
-(defvar nnfolder-marks-modtime (makehash))
+(defvar nnfolder-marks-modtime (gnus-make-hashtable))
 
 \f
 
@@ -426,7 +426,7 @@ This variable is a virtual server slot.  See the Gnus manual for details.")
              (with-temp-buffer
                (nnfolder-request-article (car maybe-expirable)
                                          newsgroup server (current-buffer))
-               (let ((nnml-current-directory nil))
+               (let ((nnfolder-current-directory nil))
                  (nnmail-expiry-target-group
                   nnmail-expiry-target newsgroup))))
            (nnheader-message 5 "Deleting article %d in %s..."
@@ -1200,9 +1200,9 @@ This command does not work if you use short group names."
 
 (defun nnfolder-marks-changed-p (group)
   (let ((file (nnfolder-group-marks-pathname group)))
-    (if (null (gethash file nnfolder-marks-modtime))
+    (if (null (gnus-gethash file nnfolder-marks-modtime))
        t ;; never looked at marks file, assume it has changed
-      (not (eq (gethash fil nnfolder-marks-modtime)
+      (not (eq (gnus-gethash file nnfolder-marks-modtime)
               (nth 5 (file-attributes file)))))))
 
 (defun nnfolder-save-marks (group server)
@@ -1214,9 +1214,9 @@ This command does not work if you use short group names."
            (erase-buffer)
            (princ nnfolder-marks (current-buffer))
            (insert "\n"))
-         (puthash file
-                  (nth 5 (file-attributes file))
-                  nnml-marks-modtime))
+         (gnus-sethash file
+                       (nth 5 (file-attributes file))
+                       nnfolder-marks-modtime))
       (error (or (gnus-yes-or-no-p
                  (format "Could not write to %s (%s).  Continue? " file err))
                 (error "Cannot write to %s (%s)" err))))))
@@ -1226,9 +1226,9 @@ This command does not work if you use short group names."
     (if (file-exists-p file)
        (setq nnfolder-marks (condition-case err
                                 (with-temp-buffer
-                                  (puthash file
-                                           (nth 5 (file-attributes file))
-                                           nnml-marks-modtime)
+                                  (gnus-sethash file
+                                                (nth 5 (file-attributes file))
+                                                nnfolder-marks-modtime)
                                   (nnheader-insert-file-contents file)
                                   (read (current-buffer)))
                               (error (or (gnus-yes-or-no-p

diff --git a/lisp/nnml.el b/lisp/nnml.el
index 17eed87..28230a9 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -126,7 +126,7 @@ This variable is a virtual server slot.  See the Gnus manual for details.")
 
 (defvoo nnml-marks nil)
 
-(defvar nnml-marks-modtime (makehash))
+(defvar nnml-marks-modtime (gnus-make-hashtable))
 
 \f
 ;;; Interface functions.
@@ -970,9 +970,9 @@ Use the nov database for the current group if available."
 (defun nnml-marks-changed-p (group)
   (let ((file (expand-file-name nnml-marks-file-name
                                (nnmail-group-pathname group nnml-directory))))
-    (if (null (gethash file nnml-marks-modtime))
+    (if (null (gnus-gethash file nnml-marks-modtime))
        t ;; never looked at marks file, assume it has changed
-      (not (eq (gethash fil nnml-marks-modtime)
+      (not (eq (gnus-gethash file nnml-marks-modtime)
             (nth 5 (file-attributes file)))))))
 
 (defun nnml-save-marks (group server)
@@ -986,9 +986,9 @@ Use the nov database for the current group if available."
            (erase-buffer)
            (princ nnml-marks (current-buffer))
            (insert "\n"))
-         (puthash file
-                  (nth 5 (file-attributes file))
-                  nnml-marks-modtime))
+         (gnus-sethash file
+                       (nth 5 (file-attributes file))
+                       nnml-marks-modtime))
       (error (or (gnus-yes-or-no-p
                  (format "Could not write to %s (%s).  Continue? " file err))
                 (error "Cannot write to %s (%s)" err))))))
@@ -1000,9 +1000,9 @@ Use the nov database for the current group if available."
     (if (file-exists-p file)
        (setq nnml-marks (condition-case err
                             (with-temp-buffer
-                              (puthash file
-                                       (nth 5 (file-attributes file))
-                                       nnml-marks-modtime)
+                              (gnus-sethash file
+                                            (nth 5 (file-attributes file))
+                                            nnml-marks-modtime)
                               (nnheader-insert-file-contents file)
                               (read (current-buffer)))
                           (error (or (gnus-yes-or-no-p