*** dist/vm-byteopts.el.dist	Mon Jan  6 07:50:08 1997
--- vm-byteopts.el	Wed Aug 12 15:11:56 1998
***************
*** 18 ****
--- 18,21 ----
  (setq byte-compile-dynamic-docstrings nil)
+ ;; avoid v20 features because users are going
+ ;; to try to share elc files no matter what we tell them.
+ (setq byte-compile-emacs19-compatibility t)
*** dist/vm-folder.el.dist	Fri Jul 24 13:11:44 1998
--- vm-folder.el	Tue Aug 11 14:02:52 1998
***************
*** 797,799 ****
      (vm-find-leading-message-separator)
!     (forward-char -1))
     ((eq vm-folder-type 'BellFrom_)
--- 797,802 ----
      (vm-find-leading-message-separator)
!     (if (and (eobp)
! 	     (let ((x (- (point) 2)))
! 	       (and (<= (point-min) x) (eq (char-after x) ?\n))))
! 	(forward-char -1)))
     ((eq vm-folder-type 'BellFrom_)
***************
*** 860,862 ****
     ((eq vm-folder-type 'From_)
!     (forward-char 1))
     ((eq vm-folder-type 'From_-with-Content-Length))
--- 863,866 ----
     ((eq vm-folder-type 'From_)
!     (if (not (eobp))
! 	(forward-char 1)))
     ((eq vm-folder-type 'From_-with-Content-Length))
*** dist/vm-startup.el.dist	Fri Jul 24 13:11:50 1998
--- vm-startup.el	Mon Aug 17 11:49:02 1998
***************
*** 295,297 ****
  
! This is VM 6.59.
  
--- 295,297 ----
  
! This is VM 6.60.
  
***************
*** 667,668 ****
--- 667,669 ----
  	     current-prefix-arg))))
+   (vm-session-initialization)
    (if (vm-multiple-frames-possible-p)
***************
*** 907,908 ****
--- 908,911 ----
    (require 'reporter)
+   (require 'vm-version)
+   (require 'vm-vars)
    ;; make sure the user doesn't try to use vm-mail here.
***************
*** 1178,1181 ****
  	      (make-face 'gui-button-face)
! 	      (set-face-foreground 'gui-button-face "black")
! 	      (set-face-background 'gui-button-face "gray75")))
  	(and (vm-mouse-support-possible-p)
--- 1181,1190 ----
  	      (make-face 'gui-button-face)
! 	      (cond ((eq window-system 'x)
! 		     (set-face-foreground 'gui-button-face "black")
! 		     (set-face-background 'gui-button-face "gray75"))
! 		    (t
! 		     ;; use primary color names, since fancier
! 		     ;; names may not be valid.
! 		     (set-face-foreground 'gui-button-face "white")
! 		     (set-face-background 'gui-button-face "red")))))
  	(and (vm-mouse-support-possible-p)
*** dist/vm-version.el.dist	Fri Jul 24 13:11:51 1998
--- vm-version.el	Mon Aug 17 11:49:02 1998
***************
*** 4,6 ****
  
! (defconst vm-version "6.59"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.60"
    "Version number of VM.")