X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-int.el;h=a5021bd4a65a496e950ae14952378987bb6c9096;hb=e5bec5d05f433a43fa2d14cdb7bebeeefab8835f;hp=bc94a5c1c796375ce938a2ac005561a565b53e3f;hpb=73edf76920c3d86afa1628ca8f1509394cb7b26c;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index bc94a5c..a5021bd 100644
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -1,7 +1,9 @@
 ;;; gnus-int.el --- backend interface functions for Gnus
-;; Copyright (C) 1996,97,98,99 Free Software Foundation, Inc.
+;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
+;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
 ;; Keywords: news
 
 ;; This file is part of GNU Emacs.
@@ -69,8 +71,7 @@ If CONFIRM is non-nil, the user will be asked for an NNTP server."
 			   (list 'nnmh-directory
 				 (file-name-as-directory
 				  (expand-file-name
-				   (concat "~/" (substring
-						 gnus-nntp-server 1)))))
+				   (substring gnus-nntp-server 1) "~/")))
 			   (list 'nnmh-get-new-mail nil)))
 		    (t
 		     (list 'nntp gnus-nntp-server)))))
@@ -124,7 +125,10 @@ If it is down, start it up (again)."
 			(format " on %s" (nth 1 method)))))
       (gnus-run-hooks 'gnus-open-server-hook)
       (prog1
-	  (gnus-open-server method)
+	  (condition-case ()
+	      (gnus-open-server method)
+	    (quit (message "Quit gnus-check-server")
+		  nil))
 	(unless silent
 	  (message ""))))))
 
@@ -295,6 +299,43 @@ If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
 	       articles (gnus-group-real-name group)
 	       (nth 1 gnus-command-method) fetch-old))))
 
+(defun gnus-retrieve-parsed-headers (articles group &optional fetch-old
+					      dependencies force-new)
+  "Request parsed-headers for ARTICLES in GROUP.
+If FETCH-OLD, retrieve all headers (or some subset thereof) in the group."
+  (unless dependencies
+    (setq dependencies
+	  (save-excursion
+	    (set-buffer gnus-summary-buffer)
+	    gnus-newsgroup-dependencies)))
+  (let ((gnus-command-method (gnus-find-method-for-group group))
+	headers)
+    (if (and gnus-use-cache (numberp (car articles)))
+	(setq headers
+	      (gnus-cache-retrieve-parsed-headers articles group fetch-old
+						  dependencies force-new))
+      (let ((func (gnus-get-function gnus-command-method
+				     'retrieve-parsed-headers 'no-error)))
+	(if func
+	    (setq headers (funcall func articles dependencies
+				   (gnus-group-real-name group)
+				   (nth 1 gnus-command-method) fetch-old
+				   force-new)
+		  gnus-headers-retrieved-by (car headers)
+		  headers (cdr headers))
+	  (setq gnus-headers-retrieved-by
+		(funcall
+		 (gnus-get-function gnus-command-method 'retrieve-headers)
+		 articles (gnus-group-real-name group)
+		 (nth 1 gnus-command-method) fetch-old))
+	  )))
+    (or headers
+	(if (eq gnus-headers-retrieved-by 'nov)
+	    (gnus-get-newsgroup-headers-xover
+	     articles nil dependencies gnus-newsgroup-name t)
+	  (gnus-get-newsgroup-headers dependencies)))
+    ))
+
 (defun gnus-retrieve-articles (articles group)
   "Request ARTICLES in GROUP."
   (let ((gnus-command-method (gnus-find-method-for-group group)))
@@ -413,13 +454,14 @@ If BUFFER, insert the article in that group."
 (defun gnus-request-scan (group gnus-command-method)
   "Request a SCAN being performed in GROUP from GNUS-COMMAND-METHOD.
 If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
-  (when gnus-plugged
-    (let ((gnus-command-method
-	   (if group (gnus-find-method-for-group group) gnus-command-method))
-	  (gnus-inhibit-demon t))
-      (funcall (gnus-get-function gnus-command-method 'request-scan)
-	       (and group (gnus-group-real-name group))
-	       (nth 1 gnus-command-method)))))
+  (let ((gnus-command-method
+	 (if group (gnus-find-method-for-group group) gnus-command-method))
+	(gnus-inhibit-demon t)
+	(mail-source-plugged gnus-plugged))
+    (if (or gnus-plugged (not (gnus-agent-method-p gnus-command-method)))
+	(funcall (gnus-get-function gnus-command-method 'request-scan)
+		 (and group (gnus-group-real-name group))
+		 (nth 1 gnus-command-method)))))
 
 (defsubst gnus-request-update-info (info gnus-command-method)
   "Request that GNUS-COMMAND-METHOD update INFO."
@@ -455,11 +497,6 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
   (goto-char (point-max))
   (unless (bolp)
     (insert "\n"))
-  (unless no-encode
-    (save-restriction
-      (message-narrow-to-head)
-      (mail-encode-encoded-word-buffer))
-    (message-encode-message-body))
   (let ((func (car (or gnus-command-method
 		       (gnus-find-method-for-group group)))))
     (funcall (intern (format "%s-request-accept-article" func))
@@ -468,11 +505,6 @@ If GROUP is nil, all groups on GNUS-COMMAND-METHOD are scanned."
 	     last)))
 
 (defun gnus-request-replace-article (article group buffer &optional no-encode)
-  (unless no-encode
-    (save-restriction
-      (message-narrow-to-head)
-      (mail-encode-encoded-word-buffer))
-    (message-encode-message-body))
   (let ((func (car (gnus-group-name-to-method group))))
     (funcall (intern (format "%s-request-replace-article" func))
 	     article (gnus-group-real-name group) buffer)))