*** pub/sgnus/lisp/gnus.el	Fri Aug  2 22:13:13 1996
--- sgnus/lisp/gnus.el	Fri Aug 30 03:19:11 1996
***************
*** 1774,1780 ****
    "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
    "The mail address of the Gnus maintainers.")
  
! (defconst gnus-version-number "5.2.39"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Gnus v%s" gnus-version-number)
--- 1774,1780 ----
    "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)"
    "The mail address of the Gnus maintainers.")
  
! (defconst gnus-version-number "5.2.40"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Gnus v%s" gnus-version-number)
***************
*** 5433,5440 ****
  		 (- (1+ (cdr active)) (car active)))))
      (gnus-summary-read-group
       group (or all (and (numberp number)
! 			(zerop (+ number (length (cdr (assq 'tick marked)))
! 				  (length (cdr (assq 'dormant marked)))))))
       no-article)))
  
  (defun gnus-group-select-group (&optional all)
--- 5433,5442 ----
  		 (- (1+ (cdr active)) (car active)))))
      (gnus-summary-read-group
       group (or all (and (numberp number)
! 			(zerop (+ number (gnus-range-length 
! 					  (cdr (assq 'tick marked)))
! 				  (gnus-range-length
! 				   (cdr (assq 'dormant marked)))))))
       no-article)))
  
  (defun gnus-group-select-group (&optional all)
***************
*** 6039,6055 ****
  (defun gnus-group-enter-directory (dir)
    "Enter an ephemeral nneething group."
    (interactive "DDirectory to read: ")
!   (let* ((method (list 'nneething dir))
  	 (leaf (gnus-group-prefixed-name
  		(file-name-nondirectory (directory-file-name dir))
  		method))
  	 (name (gnus-generate-new-group-name leaf)))
!     (let ((nneething-read-only t))
!       (or (gnus-group-read-ephemeral-group
! 	   name method t
! 	   (cons (current-buffer) (if (eq major-mode 'gnus-summary-mode)
! 				      'summary 'group)))
! 	  (error "Couldn't enter %s" dir)))))
  
  ;; Group sorting commands
  ;; Suggested by Joe Hildebrand <hildjj@idaho.fuentez.com>.
--- 6041,6057 ----
  (defun gnus-group-enter-directory (dir)
    "Enter an ephemeral nneething group."
    (interactive "DDirectory to read: ")
!   (let* ((method (list 'nneething dir '(nneething-read-only t)))
  	 (leaf (gnus-group-prefixed-name
  		(file-name-nondirectory (directory-file-name dir))
  		method))
  	 (name (gnus-generate-new-group-name leaf)))
!     (unless (gnus-group-read-ephemeral-group
! 	     name method t
! 	     (cons (current-buffer)
! 		   (if (eq major-mode 'gnus-summary-mode)
! 		       'summary 'group)))
!       (error "Couldn't enter %s" dir))))
  
  ;; Group sorting commands
  ;; Suggested by Joe Hildebrand <hildjj@idaho.fuentez.com>.
***************
*** 6628,6634 ****
  	    (gnus-group-update-group group))
  	(if (eq (gnus-server-status (gnus-find-method-for-group group))
  		'denied)
! 	    (gnus-error "Server denied access")
  	  (gnus-error 3 "%s error: %s" group (gnus-status-message group)))))
      (when beg (goto-char beg))
      (when gnus-goto-next-group-when-activating
--- 6630,6636 ----
  	    (gnus-group-update-group group))
  	(if (eq (gnus-server-status (gnus-find-method-for-group group))
  		'denied)
! 	    (gnus-error 3 "Server denied access")
  	  (gnus-error 3 "%s error: %s" group (gnus-status-message group)))))
      (when beg (goto-char beg))
      (when gnus-goto-next-group-when-activating
*** pub/sgnus/lisp/message.el	Tue Jul 30 21:30:18 1996
--- sgnus/lisp/message.el	Fri Aug 30 02:48:29 1996
***************
*** 1781,1787 ****
  		   (not (eq message-fcc-handler-function 'rmail-output)))
  	      (funcall message-fcc-handler-function file)
  	    (if (and (file-readable-p file) (mail-file-babyl-p file))
! 		(rmail-output file 1)
  	      (let ((mail-use-rfc822 t))
  		(rmail-output file 1 t t))))))
        (kill-buffer (current-buffer)))))
--- 1781,1787 ----
  		   (not (eq message-fcc-handler-function 'rmail-output)))
  	      (funcall message-fcc-handler-function file)
  	    (if (and (file-readable-p file) (mail-file-babyl-p file))
! 		(rmail-output file 1 nil t)
  	      (let ((mail-use-rfc822 t))
  		(rmail-output file 1 t t))))))
        (kill-buffer (current-buffer)))))
*** pub/sgnus/lisp/nndoc.el	Wed Jun  5 19:17:38 1996
--- sgnus/lisp/nndoc.el	Fri Aug 30 03:31:15 1996
***************
*** 53,63 ****
       (article-begin . "^#! *rnews +\\([0-9]+\\) *\n")
       (body-end-function . nndoc-rnews-body-end))
      (mbox 
!      (article-begin . 
! 		    ,(let ((delim (concat "^" message-unix-mail-delimiter)))
! 		       (if (string-match "\n\\'" delim)
! 			   (substring delim 0 (match-beginning 0))
! 			 delim)))
       (body-end-function . nndoc-mbox-body-end))
      (babyl 
       (article-begin . "\^_\^L *\n")
--- 53,60 ----
       (article-begin . "^#! *rnews +\\([0-9]+\\) *\n")
       (body-end-function . nndoc-rnews-body-end))
      (mbox 
!      (article-begin . "^From \\([^ \n]*\\(\\|\".*\"[^ \n]*\\)\\)  ?\\([^ \n]*\\) *\\([^ ]*\\) *\\([0-9]*\\) *\\([0-9:]*\\) *\\([A-Z]?[A-Z]?[A-Z][A-Z]\\( DST\\)?\\|[-+]?[0-9][0-9][0-9][0-9]\\|\\) * [0-9][0-9]\\([0-9]*\\) *\\([A-Z]?[A-Z]?[A-Z][A-Z]\\( DST\\)?\\|[-+]?[0-9][0-9][0-9][0-9]\\|\\) *\\(remote from .*\\)?\n")
!      (article-begin-function . nndoc-mbox-article-begin)
       (body-end-function . nndoc-mbox-body-end))
      (babyl 
       (article-begin . "\^_\^L *\n")
***************
*** 107,112 ****
--- 104,110 ----
  (defvoo nndoc-first-article nil)
  (defvoo nndoc-article-end nil)
  (defvoo nndoc-article-begin nil)
+ (defvoo nndoc-article-begin-function nil)
  (defvoo nndoc-head-begin nil)
  (defvoo nndoc-head-end nil)
  (defvoo nndoc-file-end nil)
***************
*** 338,344 ****
  		nndoc-body-begin nndoc-body-end-function nndoc-body-end
  		nndoc-prepare-body nndoc-article-transform
  		nndoc-generate-head nndoc-body-begin-function
! 		nndoc-head-begin-function)))
      (while vars
        (set (pop vars) nil)))
    (let* (defs guess)
--- 336,342 ----
  		nndoc-body-begin nndoc-body-end-function nndoc-body-end
  		nndoc-prepare-body nndoc-article-transform
  		nndoc-generate-head nndoc-body-begin-function
! 		nndoc-head-begin-function nndoc-article-begin-function)))
      (while vars
        (set (pop vars) nil)))
    (let* (defs guess)
***************
*** 371,377 ****
        ;; Go through the file.
        (while (if (and first nndoc-first-article)
  		 (nndoc-search nndoc-first-article)
! 	       (nndoc-search nndoc-article-begin))
  	(setq first nil)
  	(cond (nndoc-head-begin-function
  	       (funcall nndoc-head-begin-function))
--- 369,377 ----
        ;; Go through the file.
        (while (if (and first nndoc-first-article)
  		 (nndoc-search nndoc-first-article)
! 	       (if nndoc-article-begin-function
! 		   (funcall nndoc-article-begin-function)
! 		 (nndoc-search nndoc-article-begin)))
  	(setq first nil)
  	(cond (nndoc-head-begin-function
  	       (funcall nndoc-head-begin-function))
***************
*** 391,397 ****
  		   (funcall nndoc-body-end-function))
  	      (and nndoc-body-end
  		   (nndoc-search nndoc-body-end))
! 	      (nndoc-search nndoc-article-begin)
  	      (progn
  		(goto-char (point-max))
  		(when nndoc-file-end
--- 391,399 ----
  		   (funcall nndoc-body-end-function))
  	      (and nndoc-body-end
  		   (nndoc-search nndoc-body-end))
! 	      (if nndoc-article-begin-function
! 		  (funcall nndoc-article-begin-function)
! 		(nndoc-search nndoc-article-begin))
  	      (progn
  		(goto-char (point-max))
  		(when nndoc-file-end
***************
*** 410,415 ****
--- 412,421 ----
  (defun nndoc-digest-body-end ()
    (and (re-search-forward nndoc-article-begin nil t)
         (goto-char (match-beginning 0))))
+ 
+ (defun nndoc-mbox-article-begin ()
+   (when (re-search-forward nndoc-article-begin nil t)
+     (goto-char (match-beginning 0))))
  
  (defun nndoc-mbox-body-end ()
    (let ((beg (point))
*** pub/sgnus/lisp/ChangeLog	Fri Aug  2 22:17:56 1996
--- sgnus/lisp/ChangeLog	Fri Aug 30 02:23:39 1996
***************
*** 1,3 ****
--- 1,16 ----
+ Fri Aug 30 02:23:23 1996  Lars Magne Ingebrigtsen  <larsi@hrym.ifi.uio.no>
+ 
+ 	* message.el (message-do-fcc): Set the FROM-GNUS flag.
+ 
+ Sat Aug 24 23:32:02 1996  Lars Magne Ingebrigtsen  <larsi@ylfing.ifi.uio.no>
+ 
+ 	* gnus.el (gnus-group-enter-directory): Would temporarily bind
+ 	`nneething-read-only', shadowing the proper `defvar'.
+ 
+ Fri Aug  2 22:25:31 1996  Lars Magne Ingebrigtsen  <larsi@hrym.ifi.uio.no>
+ 
+ 	* gnus.el: Gnus v5.2.39 is released.
+ 
  Wed Jul 31 15:23:54 1996  Ken Olstad  <ken@mn.cheyenne.com>
  
  	* gnus-xmas.el (gnus-xmas-redefine): Disbale XFace when running