From: yamaoka <yamaoka>
Date: Wed, 31 May 2000 22:02:02 +0000 (+0000)
Subject: Sync
X-Git-Tag: t-gnus-6_14-quimby-before-AC-changed-~36
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6db83a87169facd44c64c501323973bc30a00445;p=elisp%2Fgnus.git-

Sync
with Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7aad1b..65faf35 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-05-31 14:50:52  Shenghuo ZHU  <zsh@cs.rochester.edu>
+
+	* mml.el (ange-ftp-name-format): Typo.
+
+2000-05-30  Simon Josefsson  <jas@pdc.kth.se>
+
+	* gnus-start.el (gnus-get-unread-articles): If
+	`gnus-activate-group' and/or `gnus-check-server' return nil, don't
+	try to do anything on that server.
+	
 2000-05-25  Simon Josefsson  <jas@pdc.kth.se>
 
 	* gnus-group.el (gnus-group-nnimap-edit-acl): Help text updated
diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index 6629f2a..e5730ab 100644
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1545,8 +1545,8 @@ newsgroup."
 		       (setq method (gnus-server-get-method nil method)))))
 	       (not (gnus-secondary-method-p method)))
 	  ;; These groups are foreign.  Check the level.
-	  (when (<= (gnus-info-level info) foreign-level)
-	    (setq active (gnus-activate-group group 'scan))
+	  (when (and (<= (gnus-info-level info) foreign-level)
+                     (setq active (gnus-activate-group group 'scan)))
 	    ;; Let the Gnus agent save the active file.
 	    (when (and gnus-agent gnus-plugged active)
 	      (gnus-agent-save-group-info
@@ -1587,7 +1587,8 @@ newsgroup."
 		(setq active (gnus-activate-group group))
 	      (setq active (gnus-activate-group group 'scan))
 	      (push method scanned-methods))
-	    (inline (gnus-close-group group))))))
+            (when active
+              (gnus-close-group group))))))
 
       ;; Get the number of unread articles in the group.
       (cond
@@ -1609,23 +1610,23 @@ newsgroup."
       (let* ((mg (pop retrievegroups))
 	     (method (or (car mg) gnus-select-method))
 	     (groups (cdr mg)))
-	(gnus-check-server method)
-	;; Request that the backend scan its incoming messages.
-	(when (gnus-check-backend-function 'request-scan (car method))
-	  (gnus-request-scan nil method))
-	(gnus-read-active-file-2 (mapcar (lambda (group)
-					   (gnus-group-real-name group))
-					 groups) method)
-	(dolist (group groups)
-	  (cond
-	   ((setq active (gnus-active (gnus-info-group
-				       (setq info (gnus-get-info group)))))
-	    (inline (gnus-get-unread-articles-in-group info active t)))
-	   (t
-	    ;; The group couldn't be reached, so we nix out the number of
-	    ;; unread articles and stuff.
-	    (gnus-set-active group nil)
-	    (setcar (gnus-gethash group gnus-newsrc-hashtb) t))))))
+	(when (gnus-check-server method)
+          ;; Request that the backend scan its incoming messages.
+          (when (gnus-check-backend-function 'request-scan (car method))
+            (gnus-request-scan nil method))
+          (gnus-read-active-file-2 (mapcar (lambda (group)
+                                             (gnus-group-real-name group))
+                                           groups) method)
+          (dolist (group groups)
+            (cond
+             ((setq active (gnus-active (gnus-info-group
+                                         (setq info (gnus-get-info group)))))
+              (inline (gnus-get-unread-articles-in-group info active t)))
+             (t
+              ;; The group couldn't be reached, so we nix out the number of
+              ;; unread articles and stuff.
+              (gnus-set-active group nil)
+              (setcar (gnus-gethash group gnus-newsrc-hashtb) t)))))))
 
     (gnus-message 5 "Checking new news...done")))
 
diff --git a/lisp/mml.el b/lisp/mml.el
index 707ce3c..5448fba 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -507,7 +507,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
 	 (mail-header-encode-parameter
 	  (symbol-name type) value))))))
 
-(defvar ange-ftp-path-format)
+(defvar ange-ftp-name-format)
 (defvar efs-path-regexp)
 (defun mml-parse-file-name (path)
   (if (if (boundp 'efs-path-regexp)