Re: hang on entry to group

[Shenghuo ZHU <zsh@cs.rochester.edu>]

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

>>>>> "ZSH" == Shenghuo ZHU <zsh@cs.rochester.edu> writes:

ZSH> Fixed.

ZSH> The ChangeLog and the patch follow and have been committed to CVS.

ZSH> Apply the previous patch also.

I am sorry that I made a mistake on the last patch. Now I put all
changes I made on nntp.el since 0.97 in one patch. ChangeLog is
reusable.

-- 
Shenghuo ZHU


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 97-zsh4+.diff --]
[-- Type: text/x-patch, Size: 2355 bytes --]

Index: nntp.el
===================================================================
RCS file: /usr/local/cvsroot/gnus/lisp/nntp.el,v
retrieving revision 5.20
retrieving revision 5.23
diff -r5.20 -r5.23
1121c1121,1122
< 	  (last-point (point-min))
---
> 	  last-point
> 	  in-process-buffer-p
1123c1124
< 	  ;;(process-buffer (nntp-find-connection (current-buffer))))
---
> 	  (process-buffer (nntp-find-connection-buffer nntp-server-buffer))
1136,1139c1137,1144
< 	(when (nntp-send-xover-command first (car articles))
< 	  (setq articles (cdr articles)
< 		count (1+ count))
< 
---
> 	(setq in-process-buffer-p (stringp nntp-server-xover))
> 	(nntp-send-xover-command first (car articles))
> 	(setq articles (cdr articles))
> 	
> 	(when (and nntp-server-xover in-process-buffer-p)
> 	  ;; Don't count tried request.
> 	  (setq count (1+ count))
> 	  
1144c1149,1150
< 	    (accept-process-output)
---
> 
> 	    (nntp-accept-response)
1149c1155
< 	    (set-buffer buf)
---
> 	    (set-buffer process-buffer)
1151c1157
< 		     (goto-char last-point)
---
> 		     (goto-char (or last-point (point-min)))
1157,1158c1163,1165
< 	      (accept-process-output)
< 	      (set-buffer buf)))))
---
> 	      (nntp-accept-response)
> 	      (set-buffer process-buffer))
> 	    (set-buffer buf))))
1161,1169c1168,1185
< 	;; Wait for the reply from the final command.
< 	(goto-char (point-max))
< 	(re-search-backward "^[0-9][0-9][0-9] " nil t)
< 	(when (looking-at "^[23]")
< 	  (while (progn
< 		   (goto-char (point-max))
< 		   (forward-line -1)
< 		   (not (looking-at "^\\.\r?\n")))
< 	    (nntp-accept-response)))
---
> 	(when in-process-buffer-p
> 	  (set-buffer process-buffer)
> 	  ;; Wait for the reply from the final command.
> 	  (goto-char (point-max))
> 	  (re-search-backward "^[0-9][0-9][0-9] " nil t)
> 	  (when (looking-at "^[23]")
> 	    (while (progn
> 		     (goto-char (point-max))
> 		     (forward-line -1)
> 		     (not (looking-at "^\\.\r?\n")))
> 	      (nntp-accept-response)
> 	      (set-buffer process-buffer)))
> 	  (set-buffer buf)
> 	  (goto-char (point-max))
> 	  (insert-buffer-substring process-buffer)
> 	  (set-buffer process-buffer)
> 	  (erase-buffer)
> 	  (set-buffer buf))
1192c1208
< 	  (nntp-send-command-nodelete "\r?\n\\.\r?\n" nntp-server-xover range))
---
> 	  (nntp-send-command-nodelete nil nntp-server-xover range))