X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-srvr.el;h=e5179a6bcf3cb394f42beb6b590d2a1314307c6c;hb=36bd162f4f7cd40453b8683e796730836c352b2a;hp=029d6aa1f814daa04735792c697f6d1ab8a1c34f;hpb=8d5b94488b8fe507a83eb5475ecaa54afb8a98b8;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-srvr.el b/lisp/gnus-srvr.el
index 029d6aa..e5179a6 100644
--- a/lisp/gnus-srvr.el
+++ b/lisp/gnus-srvr.el
@@ -221,7 +221,7 @@ The following specs are understood:
 All normal editing commands are switched off.
 \\<gnus-server-mode-map>
 For more in-depth information on this mode, read the manual
-(`\\[gnus-info-find-node]').
+\(`\\[gnus-info-find-node]').
 
 The following commands are available:
 
@@ -242,20 +242,22 @@ The following commands are available:
   (if (featurep 'xemacs)
       (put 'gnus-server-mode 'font-lock-defaults '(gnus-server-font-lock-keywords t))
     (set (make-local-variable 'font-lock-defaults)
-         '(gnus-server-font-lock-keywords t)))
+	 '(gnus-server-font-lock-keywords t)))
   (gnus-run-hooks 'gnus-server-mode-hook))
 
 (defun gnus-server-insert-server-line (gnus-tmp-name method)
   (let* ((gnus-tmp-how (car method))
 	 (gnus-tmp-where (nth 1 method))
 	 (elem (assoc method gnus-opened-servers))
-	 (gnus-tmp-status (cond ((eq (nth 1 elem) 'denied)
-				 "(denied)")
-				((or (gnus-server-opened method)
-				     (eq (nth 1 elem) 'ok))
-				 "(opened)")
-				(t
-				 "(closed)")))
+	 (gnus-tmp-status
+	  (if (eq (nth 1 elem) 'denied)
+	      "(denied)"
+	    (condition-case nil
+		(if (or (gnus-server-opened method)
+			(eq (nth 1 elem) 'ok))
+		    "(opened)"
+		  "(closed)")
+	      ((error) "(error)"))))
 	 (gnus-tmp-agent (if (and gnus-agent
 				  (member method
 					  gnus-agent-covered-methods))
@@ -727,7 +729,7 @@ The following commands are available:
 	(let ((buffer-read-only nil) charset)
 	  (while groups
 	    (setq group (car groups))
-	    (setq charset (gnus-group-name-charset method group))
+	    (setq charset (gnus-group-name-charset method (car group)))
 	    (gnus-add-text-properties
 	     (point)
 	     (prog1 (1+ (point))