Synch to No Gnus 200405141151.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a40c5e0..05fdcf4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-14  Kai Grossjohann  <kgrossjo@eu.uu.net>
+
+       * nntp.el (nntp-request-set-mark, nntp-request-update-info): Call
+       nntp-possibly-create-directory, not nntp-possibly-change-group.
+       (nntp-marks-changed-p): New arg SERVER.
+       (nntp-request-update-info): Adjust caller.
+
 2004-05-14  Kai Grossjohann  <kai@emptydomain.de>
 
        * nntp.el (nntp-save-marks): Pass missing arg.

diff --git a/lisp/nntp.el b/lisp/nntp.el
index c5d8184..4e3dcb7 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -1091,7 +1091,7 @@ newsgroups that match the regexp."
   t)
 
 (deffoo nntp-request-set-mark (group actions &optional server)
-  (nntp-possibly-change-group group server)
+  (nntp-possibly-create-directory group server)
   (unless nntp-marks-is-evil
     (nntp-open-marks group server)
     (dolist (action actions)
@@ -1111,8 +1111,8 @@ newsgroups that match the regexp."
   nil)
 
 (deffoo nntp-request-update-info (group info &optional server)
-  (nntp-possibly-change-group group server)
-  (when (and (not nntp-marks-is-evil) (nntp-marks-changed-p group))
+  (nntp-possibly-create-directory group server)
+  (when (and (not nntp-marks-is-evil) (nntp-marks-changed-p group server))
     (nnheader-message 8 "Updating marks for %s..." group)
     (nntp-open-marks group server)
     ;; Update info using `nntp-marks'.
@@ -2051,7 +2051,7 @@ Please refer to the following variables to customize the connection:
       (make-directory (directory-file-name dir) t)
       (nnheader-message 5 "Creating nntp marks directory %s" dir))))
 
-(defun nntp-marks-changed-p (group)
+(defun nntp-marks-changed-p (group server)
   (let ((file (expand-file-name
               nntp-marks-file-name 
               (nnmail-group-pathname