*** pub/rgnus/lisp/cus-face.el	Thu Mar  6 08:47:24 1997
--- rgnus/lisp/cus-face.el	Fri Mar  7 07:36:59 1997
***************
*** 138,161 ****
  	(set-face-foreground face bg frame)
  	(set-face-background face fg frame)))))
  
! (if (string-match "XEmacs" emacs-version)
!     ;; XEmacs.
      (defun custom-extract-frame-properties (frame)
        "Return a plist with the frame properties of FRAME used by custom."
!       (list 'type (device-type (frame-device frame))
! 	    'class (device-class (frame-device frame))
  	    'background (or custom-background-mode
! 			    (frame-property frame
! 					    'background-mode)
! 			    (custom-background-mode frame))))
!   ;; Emacs.
!   (defun custom-extract-frame-properties (frame)
!     "Return a plist with the frame properties of FRAME used by custom."
!     (list 'type window-system
! 	  'class (frame-property frame 'display-type)
! 	  'background (or custom-background-mode
! 			  (frame-property frame 'background-mode)
! 			  (custom-background-mode frame)))))  
  
  ;;; Declaring a face.
  
--- 138,194 ----
  	(set-face-foreground face bg frame)
  	(set-face-background face fg frame)))))
  
! (defcustom custom-background-mode nil
!   "The brightness of the background.
! Set this to the symbol dark if your background color is dark, light if
! your background is light, or nil (default) if you want Emacs to
! examine the brightness for you."
!   :group 'customize
!   :type '(choice (choice-item dark) 
! 		 (choice-item light)
! 		 (choice-item :tag "default" nil)))
! 
! (eval-and-compile
!   (if (string-match "XEmacs" emacs-version)
!       ;; XEmacs.
!       (defun custom-extract-frame-properties (frame)
! 	"Return a plist with the frame properties of FRAME used by custom."
! 	(list 'type (device-type (frame-device frame))
! 	      'class (device-class (frame-device frame))
! 	      'background (or custom-background-mode
! 			      (frame-property frame
! 					      'background-mode)
! 			      (custom-background-mode frame))))
!     ;; Emacs.
      (defun custom-extract-frame-properties (frame)
        "Return a plist with the frame properties of FRAME used by custom."
!       (list 'type window-system
! 	    'class (frame-property frame 'display-type)
  	    'background (or custom-background-mode
! 			    (frame-property frame 'background-mode)
! 			    (custom-background-mode frame))))))  
! 
! (defconst custom-face-attributes
!   '((:bold (toggle :format "Bold: %[%v%]\n") custom-set-face-bold)
!     (:italic (toggle :format "Italic: %[%v%]\n") custom-set-face-italic)
!     (:underline
!      (toggle :format "Underline: %[%v%]\n") set-face-underline-p)
!     (:foreground (color :tag "Foreground") set-face-foreground)
!     (:background (color :tag "Background") set-face-background)
!     (:reverse (const :format "Reverse Video\n" t) 
! 	      (lambda (face value &optional frame)
! 		;; We don't use VALUE.
! 		(reverse-face face frame)))
!     (:stipple (editable-field :format "Stipple: %v") set-face-stipple))
!   "Alist of face attributes. 
! 
! The elements are of the form (KEY TYPE SET) where KEY is a symbol
! identifying the attribute, TYPE is a widget type for editing the
! attibute, SET is a function for setting the attribute value.
! 
! The SET function should take three arguments, the face to modify, the
! value of the attribute, and optionally the frame where the face should
! be changed.")
  
  ;;; Declaring a face.
  
***************
*** 205,232 ****
  	  (funcall fun face value frame)
  	(error nil)))))
  
- (defconst custom-face-attributes
-   '((:bold (toggle :format "Bold: %[%v%]\n") custom-set-face-bold)
-     (:italic (toggle :format "Italic: %[%v%]\n") custom-set-face-italic)
-     (:underline
-      (toggle :format "Underline: %[%v%]\n") set-face-underline-p)
-     (:foreground (color :tag "Foreground") set-face-foreground)
-     (:background (color :tag "Background") set-face-background)
-     (:reverse (const :format "Reverse Video\n" t) 
- 	      (lambda (face value &optional frame)
- 		;; We don't use VALUE.
- 		(reverse-face face frame)))
-     (:stipple (editable-field :format "Stipple: %v") set-face-stipple))
-   "Alist of face attributes. 
- 
- The elements are of the form (KEY TYPE SET) where KEY is a symbol
- identifying the attribute, TYPE is a widget type for editing the
- attibute, SET is a function for setting the attribute value.
- 
- The SET function should take three arguments, the face to modify, the
- value of the attribute, and optionally the frame where the face should
- be changed.")
- 
  (defun custom-set-face-bold (face value &optional frame)
    "Set the bold property of FACE to VALUE."
    (if value
--- 238,243 ----
***************
*** 286,301 ****
  	  (unless frame
  	    (put face 'custom-face-display display))
  	  (setq spec nil))))))
- 
- (defcustom custom-background-mode nil
-   "The brightness of the background.
- Set this to the symbol dark if your background color is dark, light if
- your background is light, or nil (default) if you want Emacs to
- examine the brightness for you."
-   :group 'customize
-   :type '(choice (choice-item dark) 
- 		 (choice-item light)
- 		 (choice-item :tag "default" nil)))
  
  (defun custom-background-mode (frame)
    "Kludge to detect background mode for FRAME."
--- 297,302 ----
*** pub/rgnus/lisp/dgnushack.el	Sun Feb 16 18:16:34 1997
--- rgnus/lisp/dgnushack.el	Fri Mar  7 07:36:59 1997
***************
*** 47,52 ****
--- 47,55 ----
      (fset 'x-defined-colors 'ignore)
      (fset 'read-color 'ignore)))
  
+ (setq byte-compile-warnings 
+       '(free-vars unresolved callargs redefine))
+ 
  (defun dgnushack-compile ()
    ;;(setq byte-compile-dynamic t)
    (let ((files (directory-files "." nil ".el$"))
***************
*** 57,68 ****
  	(require 'w3-forms)
        (error (setq files (delete "nnweb.el" files))))
      (while (setq file (pop files))
-       (cond 
-        ((or (string= file "custom.el") (string= file "browse-url.el"))
- 	(setq byte-compile-warnings nil))
-        (t
- 	(setq byte-compile-warnings 
- 	      '(free-vars unresolved callargs redefine obsolete))))
        (when (or (not (member file '("gnus-xmas.el" "gnus-picon.el" 
  				    "messagexmas.el" "nnheaderxm.el"
  				    "smiley.el")))
--- 60,65 ----
*** pub/rgnus/lisp/gnus-art.el	Sun Mar  2 04:47:13 1997
--- rgnus/lisp/gnus-art.el	Fri Mar  7 07:37:00 1997
***************
*** 250,260 ****
    (autoload 'timezone-make-date-arpa-standard "timezone")
    (autoload 'mail-extract-address-components "mail-extr"))
  
- (defcustom gnus-article-save-directory gnus-directory
-   "*Name of the directory articles will be saved in (default \"~/News\")."
-   :group 'gnus-article-saving
-   :type 'directory)
- 
  (defcustom gnus-save-all-headers t
    "*If non-nil, don't remove any headers before saving."
    :group 'gnus-article-saving
--- 250,255 ----
*** pub/rgnus/lisp/gnus-ems.el	Mon Feb 10 14:27:12 1997
--- rgnus/lisp/gnus-ems.el	Fri Mar  7 07:37:00 1997
***************
*** 71,77 ****
  	 valstr))))
  
  (eval-and-compile
!   (if gnus-xemacs
        nil
  
      (defvar gnus-mouse-face-prop 'mouse-face
--- 71,77 ----
  	 valstr))))
  
  (eval-and-compile
!   (if (string-match "XEmacs\\|Lucid" emacs-version)
        nil
  
      (defvar gnus-mouse-face-prop 'mouse-face
*** pub/rgnus/lisp/gnus-picon.el	Sat Mar  1 03:54:48 1997
--- rgnus/lisp/gnus-picon.el	Fri Mar  7 07:37:00 1997
***************
*** 29,34 ****
--- 29,36 ----
  (require 'xpm)
  (require 'annotations)
  (require 'custom)
+ (require 'gnus-art)
+ (require 'gnus-win)
  
  (defgroup picons nil
    "Show pictures of people, domains, and newsgroups (XEmacs).
*** pub/rgnus/lisp/gnus-sum.el	Fri Mar  7 01:50:32 1997
--- rgnus/lisp/gnus-sum.el	Fri Mar  7 07:37:01 1997
***************
*** 314,322 ****
  			 (cons regexp (repeat string))
  			 sexp)))
  
- ;; Mark variables suggested by Thomas Michanek
- ;; <Thomas.Michanek@telelogic.se>.
- 
  (defcustom gnus-unread-mark ? 
    "*Mark used for unread articles."
    :group 'gnus-summary-marks
--- 314,319 ----
*** pub/rgnus/lisp/gnus-util.el	Sun Mar  2 04:47:16 1997
--- rgnus/lisp/gnus-util.el	Fri Mar  7 07:37:01 1997
***************
*** 36,41 ****
--- 36,44 ----
  (require 'timezone)
  (require 'message)
  
+ (eval-and-compile
+   (autoload 'nnmail-date-to-time "nnmail"))
+ 
  (defun gnus-boundp (variable)
    "Return non-nil if VARIABLE is bound and non-nil."
    (and (boundp variable)
***************
*** 704,709 ****
--- 707,713 ----
  
  ;;; Functions for saving to babyl/mail files.
  
+ (defvar rmail-default-rmail-file)
  (defun gnus-output-to-rmail (filename &optional ask)
    "Append the current article to an Rmail file named FILENAME."
    (require 'rmail)
*** pub/rgnus/lisp/gnus.el	Fri Mar  7 01:50:33 1997
--- rgnus/lisp/gnus.el	Fri Mar  7 07:37:01 1997
***************
*** 226,232 ****
    :link '(custom-manual "(gnus)Exiting Gnus")
    :group 'gnus)
  
! (defconst gnus-version-number "5.4.20"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Gnus v%s" gnus-version-number)
--- 226,232 ----
    :link '(custom-manual "(gnus)Exiting Gnus")
    :group 'gnus)
  
! (defconst gnus-version-number "5.4.21"
    "Version number for this version of Gnus.")
  
  (defconst gnus-version (format "Gnus v%s" gnus-version-number)
***************
*** 1370,1377 ****
  	     gnus-article-strip-leading-blank-lines
  	     gnus-article-strip-multiple-blank-lines
  	     gnus-article-strip-blank-lines
! 	     gnus-article-treat-overstrike
! 	     ))
  
  
  ;;; Internal variables
--- 1370,1381 ----
  	     gnus-article-strip-leading-blank-lines
  	     gnus-article-strip-multiple-blank-lines
  	     gnus-article-strip-blank-lines
! 	     gnus-article-treat-overstrike))
! 
! (defcustom gnus-article-save-directory gnus-directory
!   "*Name of the directory articles will be saved in (default \"~/News\")."
!   :group 'gnus-article-saving
!   :type 'directory)
  
  
  ;;; Internal variables
***************
*** 1638,1644 ****
        gnus-article-prepare gnus-article-set-window-start
        gnus-article-next-page gnus-article-prev-page
        gnus-request-article-this-buffer gnus-article-mode
!       gnus-article-setup-buffer gnus-narrow-to-page)
       ("gnus-art" :interactive t
        gnus-article-hide-headers gnus-article-hide-boring-headers
        gnus-article-treat-overstrike gnus-article-word-wrap
--- 1642,1649 ----
        gnus-article-prepare gnus-article-set-window-start
        gnus-article-next-page gnus-article-prev-page
        gnus-request-article-this-buffer gnus-article-mode
!       gnus-article-setup-buffer gnus-narrow-to-page
!       gnus-article-delete-invisible-text)
       ("gnus-art" :interactive t
        gnus-article-hide-headers gnus-article-hide-boring-headers
        gnus-article-treat-overstrike gnus-article-word-wrap
*** pub/rgnus/lisp/lpath.el	Tue Feb  4 03:53:17 1997
--- rgnus/lisp/lpath.el	Fri Mar  7 07:37:02 1997
***************
*** 8,31 ****
  	(fset (car args) 'ignore))
      (setq args (cdr args))))
  
  (if (string-match "XEmacs" emacs-version)
      (progn 
        (defvar track-mouse nil)
!       (maybe-fbind '(posn-point event-start x-popup-menu
! 		     facemenu-get-face window-at
! 		     coordinates-in-window-p compute-motion
! 		     x-defined-colors easy-menu-create-keymaps)) 
        ;; XEmacs thinks writting compatible code is obsolete.
        (require 'bytecomp)
        (setq byte-compile-default-warnings
  	    (delq 'obsolete byte-compile-default-warnings)))
    (defvar browse-url-browser-function nil)
!   (maybe-fbind '(color-instance-rgb-components make-color-instance
! 	         color-instance-name specifier-instance device-type
! 		 device-class get-popup-menu-response event-object
  		 x-defined-colors read-color add-submenu set-font-family
  		 font-create-object set-font-size frame-device find-face
! 		 set-extent-property make-extent characterp display-error)))
  
  (setq load-path (cons "." load-path))
  (require 'custom)
--- 8,57 ----
  	(fset (car args) 'ignore))
      (setq args (cdr args))))
  
+ (defun maybe-bind (args)
+   (mapcar (lambda (var) (unless (boundp var) (set var nil))) args))
+ 
  (if (string-match "XEmacs" emacs-version)
      (progn 
        (defvar track-mouse nil)
!       (maybe-fbind '(posn-point
! 		     event-start x-popup-menu
! 		     facemenu-get-face window-at coordinates-in-window-p
! 		     compute-motion x-defined-colors easy-menu-create-keymaps
! 		     read-event internal-find-face internal-next-face-id
! 		     make-face-internal set-frame-face-alist frame-face-alist
! 		     facemenu-add-new-face make-face-x-resource-internal
! 		     set-font-size set-font-family posn-window
! 		     run-with-idle-timer mouse-minibuffer-check window-edges
! 		     event-click-count track-mouse read-event mouse-movement-p
! 		     event-end mouse-scroll-subr overlay-lists delete-overlay
! 		     set-face-stipple mail-abbrevs-setup char-int
! 		     make-char-table set-char-table-range font-create-object
! 		     x-color-values widget-make-intangible error-message-string
! 		     w3-form-encode-xwfu
! 		     )) 
!       (maybe-bind '(global-face-data
! 		    mark-active transient-mark-mode mouse-selection-click-count
! 		    mouse-selection-click-count-buffer buffer-display-table
! 		    font-lock-defaults user-full-name user-login-name
! 		    gnus-newsgroup-name gnus-article-x-face-too-ugly))
        ;; XEmacs thinks writting compatible code is obsolete.
        (require 'bytecomp)
        (setq byte-compile-default-warnings
  	    (delq 'obsolete byte-compile-default-warnings)))
    (defvar browse-url-browser-function nil)
!   (maybe-fbind '(color-instance-rgb-components
! 		 make-color-instance color-instance-name specifier-instance
! 		 device-type device-class get-popup-menu-response event-object
  		 x-defined-colors read-color add-submenu set-font-family
  		 font-create-object set-font-size frame-device find-face
! 		 set-extent-property make-extent characterp display-error
! 		 set-face-doc-string frame-property face-doc-string
! 		 button-press-event-p next-command-event
! 		 widget-make-intangible glyphp make-glyph set-glyph-image
! 		 set-glyph-property event-glyph glyph-property event-point
! 		 device-on-window-system-p make-gui-button Info-goto-node
! 		 pp-to-string color-name)))
  
  (setq load-path (cons "." load-path))
  (require 'custom)
*** pub/rgnus/lisp/md5.el	Mon Sep  9 19:35:58 1996
--- rgnus/lisp/md5.el	Fri Mar  7 07:37:02 1997
***************
*** 369,408 ****
  ;;; Here begins the merger with the XEmacs API and the md5.el from the URL
  ;;; package.  Courtesy wmperry@spry.com
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! (defun md5 (object &optional start end)
!   "Return the MD5 (a secure message digest algorithm) of an object.
  OBJECT is either a string or a buffer.
  Optional arguments START and END denote buffer positions for computing the
  hash of a portion of OBJECT."
!   (let ((buffer nil))
!     (unwind-protect
! 	(save-excursion
! 	  (setq buffer (generate-new-buffer " *md5-work*"))
! 	  (set-buffer buffer)
! 	  (cond
! 	   ((bufferp object)
! 	    (insert-buffer-substring object start end))
! 	   ((stringp object)
! 	    (insert (if (or start end)
! 			(substring object start end)
! 		      object)))
! 	   (t nil))
! 	  (prog1
! 	      (if (<= (point-max) md5-maximum-internal-length)
! 		  (mapconcat
! 		   (function (lambda (node) (format "%02x" node)))
! 		   (md5-encode (buffer-string))
! 		   "")
! 		(call-process-region (point-min) (point-max)
! 				     (or shell-file-name "/bin/sh")
! 				     t buffer nil
! 				     "-c" md5-program)
! 		;; MD5 digest is 32 chars long
! 		;; mddriver adds a newline to make neaten output for tty
! 		;; viewing, make sure we leave it behind.
! 		(buffer-substring (point-min) (+ (point-min) 32)))
! 	    (kill-buffer buffer)))
!       (and buffer (kill-buffer buffer) nil))))
  
  (provide 'md5)
  
--- 369,410 ----
  ;;; Here begins the merger with the XEmacs API and the md5.el from the URL
  ;;; package.  Courtesy wmperry@spry.com
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! (eval-and-compile
!   (unless (fboundp 'md5)
!     (defun md5 (object &optional start end)
!       "Return the MD5 (a secure message digest algorithm) of an object.
  OBJECT is either a string or a buffer.
  Optional arguments START and END denote buffer positions for computing the
  hash of a portion of OBJECT."
!       (let ((buffer nil))
! 	(unwind-protect
! 	    (save-excursion
! 	      (setq buffer (generate-new-buffer " *md5-work*"))
! 	      (set-buffer buffer)
! 	      (cond
! 	       ((bufferp object)
! 		(insert-buffer-substring object start end))
! 	       ((stringp object)
! 		(insert (if (or start end)
! 			    (substring object start end)
! 			  object)))
! 	       (t nil))
! 	      (prog1
! 		  (if (<= (point-max) md5-maximum-internal-length)
! 		      (mapconcat
! 		       (function (lambda (node) (format "%02x" node)))
! 		       (md5-encode (buffer-string))
! 		       "")
! 		    (call-process-region (point-min) (point-max)
! 					 (or shell-file-name "/bin/sh")
! 					 t buffer nil
! 					 "-c" md5-program)
! 		    ;; MD5 digest is 32 chars long
! 		    ;; mddriver adds a newline to make neaten output for tty
! 		    ;; viewing, make sure we leave it behind.
! 		    (buffer-substring (point-min) (+ (point-min) 32)))
! 		(kill-buffer buffer)))
! 	  (and buffer (kill-buffer buffer) nil))))))
  
  (provide 'md5)
  
*** pub/rgnus/lisp/message.el	Fri Mar  7 01:50:34 1997
--- rgnus/lisp/message.el	Fri Mar  7 07:37:02 1997
***************
*** 29,36 ****
  
  ;;; Code:
  
! (eval-when-compile 
!   (require 'cl))
  (require 'mailheader)
  (require 'rmail)
  (require 'nnheader)
--- 29,35 ----
  
  ;;; Code:
  
! (require 'cl)
  (require 'mailheader)
  (require 'rmail)
  (require 'nnheader)
***************
*** 823,829 ****
    (autoload 'gnus-point-at-eol "gnus-util")
    (autoload 'gnus-point-at-bol "gnus-util")
    (autoload 'gnus-output-to-mail "gnus-util")
!   (autoload 'gnus-output-to-rmail "gnus-util"))
  
  
  
--- 822,829 ----
    (autoload 'gnus-point-at-eol "gnus-util")
    (autoload 'gnus-point-at-bol "gnus-util")
    (autoload 'gnus-output-to-mail "gnus-util")
!   (autoload 'gnus-output-to-rmail "gnus-util")
!   (autoload 'mail-abbrev-in-expansion-header-p "mailabbrev"))
  
  
  
***************
*** 874,879 ****
--- 874,889 ----
  		 (setq paren nil))))
  	(nreverse elems)))))
  
+ (defun message-mail-file-mbox-p (file)
+   "Say whether FILE looks like a Unix mbox file."
+   (when (and (file-exists-p file)
+ 	     (file-readable-p file)
+ 	     (file-regular-p file))
+     (nnheader-temp-write nil
+       (nnheader-insert-file-contents file)
+       (goto-char (point-min))
+       (looking-at message-unix-mail-delimiter))))
+ 
  (defun message-fetch-field (header &optional not-all)
    "The same as `mail-fetch-field', only remove all newlines."
    (let ((value (mail-fetch-field header nil (not not-all))))
***************
*** 1405,1411 ****
          (unless (equal 0 (call-process-region
                             (point-min) (point-max) program t t))
              (insert body)
!             (gnus-message 1 "%s failed." program))))))
  
  (defun message-rename-buffer (&optional enter-string)
    "Rename the *message* buffer to \"*message* RECIPIENT\".  
--- 1415,1421 ----
          (unless (equal 0 (call-process-region
                             (point-min) (point-max) program t t))
              (insert body)
!             (message "%s failed." program))))))
  
  (defun message-rename-buffer (&optional enter-string)
    "Rename the *message* buffer to \"*message* RECIPIENT\".  
*** pub/rgnus/lisp/nnbabyl.el	Thu Mar  6 08:47:26 1997
--- rgnus/lisp/nnbabyl.el	Fri Mar  7 07:37:02 1997
***************
*** 333,339 ****
         (save-excursion
  	 (while (re-search-backward "^X-Gnus-Newsgroup: " beg t)
  	   (delete-region (point) (progn (forward-line 1) (point)))))
!        (nnmail-cache-insert (nnmail-fetch-field "message-id"))
         (setq result (car (nnbabyl-save-mail
  			  (if (stringp group)
  			      (list (cons group (nnbabyl-active-number group)))
--- 333,340 ----
         (save-excursion
  	 (while (re-search-backward "^X-Gnus-Newsgroup: " beg t)
  	   (delete-region (point) (progn (forward-line 1) (point)))))
!        (when nnmail-cache-message-id-when-accepting
! 	 (nnmail-cache-insert (nnmail-fetch-field "message-id")))
         (setq result (car (nnbabyl-save-mail
  			  (if (stringp group)
  			      (list (cons group (nnbabyl-active-number group)))
*** pub/rgnus/lisp/nnfolder.el	Fri Mar  7 01:50:34 1997
--- rgnus/lisp/nnfolder.el	Fri Mar  7 07:37:03 1997
***************
*** 382,388 ****
         (forward-line -1)
         (while (re-search-backward (concat "^" nnfolder-article-marker) nil t)
  	 (delete-region (point) (progn (forward-line 1) (point))))
!        (nnmail-cache-insert (nnmail-fetch-field "message-id"))
         (setq result
  	     (car (nnfolder-save-mail
  		   (if (stringp group)
--- 382,389 ----
         (forward-line -1)
         (while (re-search-backward (concat "^" nnfolder-article-marker) nil t)
  	 (delete-region (point) (progn (forward-line 1) (point))))
!        (when nnmail-cache-message-id-when-accepting
! 	 (nnmail-cache-insert (nnmail-fetch-field "message-id")))
         (setq result
  	     (car (nnfolder-save-mail
  		   (if (stringp group)
***************
*** 391,397 ****
  			   (nnmail-article-group 'nnfolder-active-number)))))))
       (when last
         (save-excursion
! 	 (nnfolder-possibly-change-folder (or (car art-group) group))
  	 (nnfolder-save-buffer)
  	 (nnmail-cache-close))))
      (nnmail-save-active nnfolder-group-alist nnfolder-active-file)
--- 392,398 ----
  			   (nnmail-article-group 'nnfolder-active-number)))))))
       (when last
         (save-excursion
! 	 (nnfolder-possibly-change-folder (or (caar art-group) group))
  	 (nnfolder-save-buffer)
  	 (nnmail-cache-close))))
      (nnmail-save-active nnfolder-group-alist nnfolder-active-file)
***************
*** 711,717 ****
          file)
      (while (setq file (pop files))
        (when (and (not (backup-file-name-p file))
!                  (nnheader-mail-file-mbox-p
  		  (concat nnfolder-directory file)))
          (nnheader-message 5 "Adding group %s..." file)
          (push (list file (cons 1 0)) nnfolder-group-alist)
--- 712,718 ----
          file)
      (while (setq file (pop files))
        (when (and (not (backup-file-name-p file))
!                  (message-mail-file-mbox-p
  		  (concat nnfolder-directory file)))
          (nnheader-message 5 "Adding group %s..." file)
          (push (list file (cons 1 0)) nnfolder-group-alist)
*** pub/rgnus/lisp/nnheader.el	Fri Jan 17 06:04:58 1997
--- rgnus/lisp/nnheader.el	Fri Mar  7 07:37:03 1997
***************
*** 56,62 ****
   (autoload 'nnmail-message-id "nnmail")
   (autoload 'mail-position-on-field "sendmail")
   (autoload 'message-remove-header "message")
!  (autoload 'cancel-function-timers "timers"))
  
  ;;; Header access macros.
  
--- 56,64 ----
   (autoload 'nnmail-message-id "nnmail")
   (autoload 'mail-position-on-field "sendmail")
   (autoload 'message-remove-header "message")
!  (autoload 'cancel-function-timers "timers")
!  (autoload 'gnus-point-at-eol "gnus-util")
!  (autoload 'gnus-buffer-live-p "gnus-util"))
  
  ;;; Header access macros.
  
***************
*** 626,644 ****
  	(insert (apply 'format format args))
        (apply 'insert format args))
      t))
- 
- (defun nnheader-mail-file-mbox-p (file)
-   "Say whether FILE looks like an Unix mbox file."
-   (when (and (file-exists-p file)
- 	     (file-readable-p file)
- 	     (file-regular-p file))
-     (save-excursion
-       (nnheader-set-temp-buffer " *mail-file-mbox-p*")
-       (nnheader-insert-file-contents file)
-       (goto-char (point-min))
-       (prog1
- 	  (looking-at message-unix-mail-delimiter)
- 	(kill-buffer (current-buffer))))))
  
  (defun nnheader-replace-chars-in-string (string from to)
    "Replace characters in STRING from FROM to TO."
--- 628,633 ----
*** pub/rgnus/lisp/nnheaderxm.el	Thu Jan  9 11:59:33 1997
--- rgnus/lisp/nnheaderxm.el	Fri Mar  7 07:37:03 1997
***************
*** 25,30 ****
--- 25,33 ----
  
  ;;; Code:
  
+ (eval-and-compile
+   (autoload 'nnheader-insert-file-contents "nnheader"))
+ 
  (defun nnheader-xmas-run-at-time (time repeat function &rest args)
    (start-itimer
     "nnheader-run-at-time"
*** pub/rgnus/lisp/nnmail.el	Thu Mar  6 08:47:27 1997
--- rgnus/lisp/nnmail.el	Fri Mar  7 07:37:03 1997
***************
*** 28,36 ****
  (require 'nnheader)
  (require 'timezone)
  (require 'message)
! (eval-when-compile (require 'cl))
  (require 'custom)
  
  (defgroup nnmail nil
    "Reading mail with Gnus."
    :group 'gnus)
--- 28,39 ----
  (require 'nnheader)
  (require 'timezone)
  (require 'message)
! (require 'cl)
  (require 'custom)
  
+ (eval-and-compile
+   (autoload 'gnus-error "gnus-util"))
+ 
  (defgroup nnmail nil
    "Reading mail with Gnus."
    :group 'gnus)
***************
*** 422,427 ****
--- 425,435 ----
  		 (const warn)
  		 (const delete)))
  
+ (defvar nnmail-cache-message-id-when-accepting nil
+   "If non-nil put the Message-ID: of incoming messages in the message ID cache.
+ Not doing so is dangerous, but it is how Gnus used to work for a long
+ time.")
+ 
  ;;; Internal variables.
  
  (defvar nnmail-split-history nil
***************
*** 1682,1690 ****
  	      his nil)))
      found))
  
  (defun nnmail-pop3-movemail (inbox crashbox)
    "Function to move mail from INBOX on a pop3 server to file CRASHBOX."
-   (require 'pop3)
    (let ((pop3-maildrop
           (substring inbox (match-end (string-match "^po:" inbox)))))
      (pop3-movemail crashbox)))
--- 1690,1700 ----
  	      his nil)))
      found))
  
+ (eval-and-compile
+   (autoload 'pop3-movemail "pop3"))
+ 
  (defun nnmail-pop3-movemail (inbox crashbox)
    "Function to move mail from INBOX on a pop3 server to file CRASHBOX."
    (let ((pop3-maildrop
           (substring inbox (match-end (string-match "^po:" inbox)))))
      (pop3-movemail crashbox)))
*** pub/rgnus/lisp/nnmbox.el	Thu Mar  6 08:47:27 1997
--- rgnus/lisp/nnmbox.el	Fri Mar  7 07:37:04 1997
***************
*** 304,310 ****
         (forward-line -1)
         (while (re-search-backward "^X-Gnus-Newsgroup: " nil t)
  	 (delete-region (point) (progn (forward-line 1) (point))))
!        (nnmail-cache-insert (nnmail-fetch-field "message-id"))
         (setq result (nnmbox-save-mail
  		     (if (stringp group)
  			 (list (cons group (nnmbox-active-number group)))
--- 304,311 ----
         (forward-line -1)
         (while (re-search-backward "^X-Gnus-Newsgroup: " nil t)
  	 (delete-region (point) (progn (forward-line 1) (point))))
!        (when nnmail-cache-message-id-when-accepting
! 	 (nnmail-cache-insert (nnmail-fetch-field "message-id")))
         (setq result (nnmbox-save-mail
  		     (if (stringp group)
  			 (list (cons group (nnmbox-active-number group)))
*** pub/rgnus/lisp/nnmh.el	Thu Mar  6 08:47:27 1997
--- rgnus/lisp/nnmh.el	Fri Mar  7 07:37:04 1997
***************
*** 290,296 ****
  (deffoo nnmh-request-accept-article (group &optional server last noinsert)
    (nnmh-possibly-change-directory group server)
    (nnmail-check-syntax)
!   (nnmail-save-active nnml-group-alist nnml-active-file)
    (if (stringp group)
        (and 
         (nnmail-activate 'nnmh)
--- 290,297 ----
  (deffoo nnmh-request-accept-article (group &optional server last noinsert)
    (nnmh-possibly-change-directory group server)
    (nnmail-check-syntax)
!   (when nnmail-cache-message-id-when-accepting
!     (nnmail-cache-insert (nnmail-fetch-field "message-id")))
    (if (stringp group)
        (and 
         (nnmail-activate 'nnmh)
*** pub/rgnus/lisp/nnml.el	Thu Mar  6 08:47:27 1997
--- rgnus/lisp/nnml.el	Fri Mar  7 07:37:04 1997
***************
*** 313,319 ****
    (nnml-possibly-change-directory group server)
    (nnmail-check-syntax)
    (let (result)
!     (nnmail-cache-insert (nnmail-fetch-field "message-id"))
      (if (stringp group)
  	(and 
  	 (nnmail-activate 'nnml)
--- 313,320 ----
    (nnml-possibly-change-directory group server)
    (nnmail-check-syntax)
    (let (result)
!     (when nnmail-cache-message-id-when-accepting
!       (nnmail-cache-insert (nnmail-fetch-field "message-id")))
      (if (stringp group)
  	(and 
  	 (nnmail-activate 'nnml)
*** pub/rgnus/lisp/nnweb.el	Sun Feb 16 18:16:41 1997
--- rgnus/lisp/nnweb.el	Fri Mar  7 07:37:04 1997
***************
*** 34,39 ****
--- 34,40 ----
  (require 'gnus)
  (require 'w3)
  (require 'url)
+ (require 'nnmail)
  (ignore-errors
    (require 'w3-forms))
  
*** pub/rgnus/lisp/smiley.el	Thu Mar  6 08:47:28 1997
--- rgnus/lisp/smiley.el	Fri Mar  7 07:37:05 1997
***************
*** 248,253 ****
--- 248,254 ----
  		   (= (char-after (1- (point))) ?\()))
        t)))
  
+ (defvar gnus-article-buffer)
  ;;;###autoload    
  (defun gnus-smiley-display ()
    (interactive)
*** pub/rgnus/lisp/ChangeLog	Fri Mar  7 01:50:31 1997
--- rgnus/lisp/ChangeLog	Fri Mar  7 07:36:58 1997
***************
*** 1,3 ****
--- 1,39 ----
+ Fri Mar  7 07:36:14 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
+ 
+ 	* gnus.el: Gnus v5.4.21 is released.
+ 
+ Fri Mar  7 04:17:40 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+ 
+ 	* nnfolder.el (nnfolder-request-accept-article): Switch to the
+ 	right folder.
+ 
+ 	* Makefile (gnus-load.el): cus-edit.
+ 
+ 	* gnus.el: Removed all compilation warnings under both Emacs and
+ 	XEmacs. 
+ 
+ 	* cus-face.el: Moved variable defintions around a bit to avoid
+ 	compilation warnings.
+ 
+ 	* nnmail.el (nnmail-cache-message-id-when-accepting): New
+ 	variable. 
+ 
+ 	* nnfolder.el (nnfolder-dont-cache-message-id): Removed.
+ 	* nnmh.el (nnmh-request-accept-article): Ditto.
+ 	* nnbabyl.el (nnbabyl-request-accept-article): Ditto.
+ 	* nnml.el (nnml-request-accept-article): Ditto.
+ 	* nnmbox.el (nnmbox-request-accept-article): Use it.
+ 
+ Thu Mar  6 18:22:29 1997  Steven L Baur  <steve@altair.xemacs.org>
+ 
+ 	* nnfolder.el (nnfolder-dont-cache-message-id): Variable to allow
+ 	backwards compatibility with respect to saved messages.
+ 	(nnfolder-request-accept-article): Use it.
+ 
+ Fri Mar  7 04:10:21 1997  Lars Magne Ingebrigtsen  <larsi@ifi.uio.no>
+ 
+ 	* nnmail.el: Autoload pop3.
+ 
  Fri Mar  7 01:33:34 1997  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
  
  	* gnus.el: Gnus v5.4.20 is released.
*** pub/rgnus/lisp/Makefile	Sat Mar  1 03:54:53 1997
--- rgnus/lisp/Makefile	Fri Mar  7 07:37:05 1997
***************
*** 28,34 ****
  	echo ";;" >> gnus-load.el
  	echo ";;; Code:" >> gnus-load.el
  	echo >> gnus-load.el
! 	$(EMACS)  $(FLAGS) -l ./dgnushack.el -l custom-edit.el *.el \
  		-f custom-make-dependencies >> gnus-load.el
  	echo >> gnus-load.el
  	echo "(provide 'gnus-load)" >> gnus-load.el
--- 28,34 ----
  	echo ";;" >> gnus-load.el
  	echo ";;; Code:" >> gnus-load.el
  	echo >> gnus-load.el
! 	$(EMACS)  $(FLAGS) -l ./dgnushack.el -l cus-edit.el *.el \
  		-f custom-make-dependencies >> gnus-load.el
  	echo >> gnus-load.el
  	echo "(provide 'gnus-load)" >> gnus-load.el