*** dist/vm-imap.el.dist	Fri Nov 10 20:50:28 2000
--- vm-imap.el	Wed Nov 15 18:44:42 2000
***************
*** 433,435 ****
  	    ;; Tell MULE not to mess with the text.
! 	    (if (or vm-xemacs-mule-p vm-fsfemacs-mule-p)
  		(set-buffer-file-coding-system (vm-binary-coding-system) t))
--- 433,435 ----
  	    ;; Tell MULE not to mess with the text.
! 	    (if (fboundp 'set-buffer-file-coding-system)
  		(set-buffer-file-coding-system (vm-binary-coding-system) t))
*** dist/vm-macro.el.dist	Tue Nov 14 21:42:27 2000
--- vm-macro.el	Wed Nov 15 18:34:35 2000
***************
*** 117,118 ****
--- 117,119 ----
    (cond (vm-xemacs-mule-p 'binary)
+ 	(vm-xemacs-file-coding-p 'binary)
  	(t 'no-conversion)))
***************
*** 121,122 ****
--- 122,124 ----
    (cond (vm-xemacs-mule-p 'no-conversion)
+ 	(vm-xemacs-file-coding-p 'no-conversion)
  	(t 'raw-text)))
*** dist/vm-mime.el.dist	Tue Nov 14 21:42:27 2000
--- vm-mime.el	Wed Nov 15 18:44:43 2000
***************
*** 1071,1073 ****
  	     (setq scroll-in-place nil)
! 	     (if (or vm-xemacs-mule-p vm-fsfemacs-mule-p)
  		 (set-buffer-file-coding-system (vm-binary-coding-system) t))
--- 1071,1073 ----
  	     (setq scroll-in-place nil)
! 	     (if (fboundp 'set-buffer-file-coding-system)
  		 (set-buffer-file-coding-system (vm-binary-coding-system) t))
***************
*** 1689,1691 ****
  		;; this is a text type.
! 		(if (or vm-xemacs-mule-p vm-fsfemacs-mule-p)
  		    (if (vm-mime-text-type-layout-p layout)
--- 1689,1691 ----
  		;; this is a text type.
! 		(if (fboundp 'set-buffer-file-coding-system)
  		    (if (vm-mime-text-type-layout-p layout)
***************
*** 2581,2583 ****
  	    ;; this is a text type.
! 	    (if (or vm-xemacs-mule-p vm-fsfemacs-mule-p)
  		(if (vm-mime-text-type-layout-p layout)
--- 2581,2583 ----
  	    ;; this is a text type.
! 	    (if (fboundp 'set-buffer-file-coding-system)
  		(if (vm-mime-text-type-layout-p layout)
***************
*** 2621,2623 ****
  	      ;; this is a text type.
! 	      (if (or vm-xemacs-mule-p vm-fsfemacs-mule-p)
  		  (if (vm-mime-text-type-layout-p layout)
--- 2621,2623 ----
  	      ;; this is a text type.
! 	      (if (fboundp 'set-buffer-file-coding-system)
  		  (if (vm-mime-text-type-layout-p layout)
*** dist/vm-misc.el.dist	Tue Nov 14 21:42:27 2000
--- vm-misc.el	Wed Nov 15 18:44:43 2000
***************
*** 196,198 ****
  	    ;; Tell MULE to pick the correct newline conversion.
! 	    (if (or vm-xemacs-mule-p vm-fsfemacs-mule-p)
  		(set-buffer-file-coding-system 
--- 196,198 ----
  	    ;; Tell MULE to pick the correct newline conversion.
! 	    (if (fboundp 'set-buffer-file-coding-system)
  		(set-buffer-file-coding-system 
***************
*** 762,764 ****
  		   (and (buffer-name b)
! 			(not (buffer-modified-p b))
  			(kill-buffer b))))
--- 762,766 ----
  		   (and (buffer-name b)
! 			(or (not (buffer-modified-p b))
! 			    (not (vm-buffer-variable-value
! 				  b buffer-offer-save)))
  			(kill-buffer b))))
*** dist/vm-mouse.el.dist	Tue Nov 14 21:42:27 2000
--- vm-mouse.el	Wed Nov 15 18:44:42 2000
***************
*** 236,238 ****
  	       (setq buffer-file-type nil)
! 	       (if (or vm-xemacs-mule-p vm-fsfemacs-mule-p)
  		   (set-buffer-file-coding-system
--- 236,238 ----
  	       (setq buffer-file-type nil)
! 	       (if (fboundp 'set-buffer-file-coding-system)
  		   (set-buffer-file-coding-system
*** dist/vm-pop.el.dist	Fri Nov 10 20:50:28 2000
--- vm-pop.el	Wed Nov 15 18:44:42 2000
***************
*** 401,403 ****
  	    ;; Tell MULE not to mess with the text.
! 	    (if (or vm-xemacs-mule-p vm-fsfemacs-mule-p)
  		(set-buffer-file-coding-system (vm-binary-coding-system) t))
--- 401,403 ----
  	    ;; Tell MULE not to mess with the text.
! 	    (if (fboundp 'set-buffer-file-coding-system)
  		(set-buffer-file-coding-system (vm-binary-coding-system) t))
***************
*** 452,455 ****
  			    (vm-pop-md5 (concat timestamp pass))))
! 		   (and (null (vm-pop-read-response process))
! 			(throw 'done nil)))
  		  (t (error "Don't know how to authenticate using %s" auth)))
--- 452,461 ----
  			    (vm-pop-md5 (concat timestamp pass))))
! 		   (if (null (vm-pop-read-response process))
! 		       (progn
! 			 (setq vm-pop-passwords
! 			       (delete (list source-nopwd pass)
! 				       vm-pop-passwords))
! 			 (message "POP password for %s incorrect" popdrop)
! 			 (sleep-for 2)
! 			 (throw 'done nil))))
  		  (t (error "Don't know how to authenticate using %s" auth)))
*** dist/vm-startup.el.dist	Tue Nov 14 21:42:27 2000
--- vm-startup.el	Wed Nov 15 20:56:44 2000
***************
*** 95,97 ****
        (defvar buffer-file-coding-system)
!       (if (and vm-xemacs-mule-p
  	       (not (eq (get-coding-system buffer-file-coding-system)
--- 95,97 ----
        (defvar buffer-file-coding-system)
!       (if (and (or vm-xemacs-mule-p vm-xemacs-file-coding-p)
  	       (not (eq (get-coding-system buffer-file-coding-system)
***************
*** 345,347 ****
  
! This is VM 6.83.
  
--- 345,347 ----
  
! This is VM 6.84.
  
***************
*** 1002,1004 ****
    (let ((reporter-mailer '(vm-mail))
! 	(mail-user-agent '(vm-user-agent)))
      (delete-other-windows)
--- 1002,1004 ----
    (let ((reporter-mailer '(vm-mail))
! 	(mail-user-agent 'vm-user-agent))
      (delete-other-windows)
*** dist/vm-vars.el.dist	Tue Nov 14 21:42:28 2000
--- vm-vars.el	Wed Nov 15 20:06:32 2000
***************
*** 1187,1189 ****
  
! (defvar vm-page-continuation-glyph "...hit SPACE to see more..."
    "*Glyph VM uses to indicate there is more text on the next page.
--- 1187,1189 ----
  
! (defvar vm-page-continuation-glyph "...press SPACE to see more..."
    "*Glyph VM uses to indicate there is more text on the next page.
*** dist/vm-version.el.dist	Tue Nov 14 21:42:28 2000
--- vm-version.el	Wed Nov 15 20:56:44 2000
***************
*** 4,6 ****
  
! (defconst vm-version "6.83"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.84"
    "Version number of VM.")
***************
*** 13,14 ****
--- 13,15 ----
  (defconst vm-xemacs-mule-p nil)
+ (defconst vm-xemacs-file-coding-p nil)
  (defconst vm-fsfemacs-p nil)
***************
*** 17,18 ****
--- 18,20 ----
  (defun vm-xemacs-mule-p () vm-xemacs-mule-p)
+ (defun vm-xemacs-file-coding-p () vm-xemacs-file-coding-p)
  (defun vm-fsfemacs-p () vm-fsfemacs-p)
***************
*** 24,25 ****
--- 26,30 ----
  			      (fboundp 'set-buffer-file-coding-system))
+ 	vm-xemacs-file-coding-p (and vm-xemacs-p (featurep 'file-coding)
+ 				     ;; paranoia
+ 				     (fboundp 'set-buffer-file-coding-system))
  	vm-fsfemacs-p (not vm-xemacs-p)
*** dist/vm-window.el.dist	Tue Nov 14 21:42:28 2000
--- vm-window.el	Wed Nov 15 18:40:11 2000
***************
*** 143,145 ****
  	    ;; for MULE
! 	    (if (or vm-xemacs-mule-p vm-fsfemacs-mule-p)
  		(set-buffer-file-coding-system (vm-line-ending-coding-system)))
--- 143,145 ----
  	    ;; for MULE
! 	    (if (fboundp 'set-buffer-file-coding-system)
  		(set-buffer-file-coding-system (vm-line-ending-coding-system)))