*** dist/vm-folder.el.dist	Tue Jul 14 12:10:13 1998
--- vm-folder.el	Tue Jul 14 12:17:58 1998
***************
*** 2792,2793 ****
--- 2792,2794 ----
  
+ (defvar timer-list)
  (defun vm-timer-using (fun)
*** dist/vm-imap.el.dist	Tue Jul 14 12:10:13 1998
--- vm-imap.el	Thu Jul 16 17:41:14 1998
***************
*** 732,733 ****
--- 732,734 ----
      (vm-imap-cleanup-region start end)
+     (vm-munge-message-separators vm-folder-type start end)
      (goto-char start)
*** dist/vm-mime.el.dist	Tue Jul 14 12:10:14 1998
--- vm-mime.el	Tue Jul 21 12:39:46 1998
***************
*** 853,854 ****
--- 853,857 ----
  
+ (defvar buffer-display-table)
+ (defvar standard-display-table)
+ (defvar buffer-file-type)
  (defun vm-make-presentation-copy (m)
***************
*** 1360,1382 ****
  	  (let ((buffer-read-only nil)
! 		(work-buffer nil))
  	    (message "Inlining text/html, be patient...")
! 	    ;; w3-region is not as tame as we would like.  Make
! 	    ;; sure the yoke is firmly attached, i.e. process the
! 	    ;; HTML in a temp buffer and then copy it back to the
! 	    ;; presentation buffer.  Also do save-excursion and
! 	    ;; save-window-excursion to keep current buffer and window
! 	    ;; configuration changes from happening.
! 	    (unwind-protect
! 		(progn
! 		  (save-excursion
! 		    (set-buffer (setq work-buffer
! 				      (generate-new-buffer " *workbuf*")))
! 		    (vm-mime-insert-mime-body layout)
! 		    (vm-mime-transfer-decode-region layout
! 						    (point-min) (point-max))
! 		    (save-excursion
! 		      (save-window-excursion
! 			(w3-region (point-min) (point-max)))))
! 		  (insert-buffer-substring work-buffer))
! 	      (and work-buffer (kill-buffer work-buffer)))
  	    (message "Inlining text/html... done")
--- 1363,1380 ----
  	  (let ((buffer-read-only nil)
! 		(start (point))
! 		end buffer-size)
  	    (message "Inlining text/html, be patient...")
! 	    ;; We need to keep track of where the end of the
! 	    ;; processed text is.  Best way to do this is to
! 	    ;; avoid markers and save-exurcsion, and just use
! 	    ;; buffer size changes as an indicator.
! 	    (vm-mime-insert-mime-body layout)
! 	    (setq end (point))
! 	    (setq buffer-size (buffer-size))
! 	    (vm-mime-transfer-decode-region layout start end)
! 	    (setq end (+ end (- (buffer-size) buffer-size)))
! 	    (setq buffer-size (buffer-size))
! 	    (w3-region start end)
! 	    (setq end (+ end (- (buffer-size) buffer-size)))
! 	    (goto-char end)
  	    (message "Inlining text/html... done")
***************
*** 1602,1604 ****
  	       (setq type (car (vm-mm-layout-type (car part-list))))
! 	       (cond ((vm-mime-can-display-internal (car part-list))
  		      (setq best (car part-list)
--- 1600,1603 ----
  	       (setq type (car (vm-mm-layout-type (car part-list))))
! 	       (cond ((and (vm-mime-can-display-internal (car part-list))
! 			   (vm-mime-should-display-internal (car part-list)))
  		      (setq best (car part-list)
***************
*** 2784,2787 ****
  	  (setq e (car e-list))
! 	  (if (or just-one (= (point) (extent-start-position e)))
! 	      nil
  	    (narrow-to-region (point) (extent-start-position e))
--- 2783,2790 ----
  	  (setq e (car e-list))
! 	  (if (or just-one
! 		  (save-excursion
! 		    (eq (extent-start-position e)
! 			(re-search-forward "[ \t\n]*"
! 					   (extent-start-position e) t))))
! 	      (delete-region (point) (extent-start-position e))
  	    (narrow-to-region (point) (extent-start-position e))
***************
*** 2930,2933 ****
  	;; extent, if any.
! 	(if (or just-one (= (point) (point-max)))
! 	    nil
  	  (if enriched
--- 2933,2936 ----
  	;; extent, if any.
! 	(if (or just-one (looking-at "[ \t\n]*\\'"))
! 	    (delete-region (point) (point-max))
  	  (if enriched
***************
*** 3091,3094 ****
  	  (setq o (car o-list))
! 	  (if (or just-one (= (point) (overlay-start o)))
! 	      nil
  	    (narrow-to-region (point) (overlay-start o))
--- 3094,3100 ----
  	  (setq o (car o-list))
! 	  (if (or just-one
! 		  (save-excursion
! 		    (eq (overlay-start e)
! 			(re-search-forward "[ \t\n]*" (overlay-start o) t))))
! 	      (delete-region (point) (overlay-start o))
  	    (narrow-to-region (point) (overlay-start o))
***************
*** 3263,3266 ****
  	;; extent, if any.
! 	(if (or just-one (= (point) (point-max)))
! 	    nil
  	  ;; support enriched-mode for text/enriched composition
--- 3269,3272 ----
  	;; extent, if any.
! 	(if (or just-one (looking-at "[ \t\n]*\\'"))
! 	    (delete-region (point) (point-max))
  	  ;; support enriched-mode for text/enriched composition
*** dist/vm-misc.el.dist	Sun Jun 28 01:08:56 1998
--- vm-misc.el	Tue Jul 21 12:39:45 1998
***************
*** 174,175 ****
--- 174,177 ----
  
+ (defvar buffer-file-type)
+ 
  (defun vm-write-string (where string)
*** dist/vm-mouse.el.dist	Wed Feb 18 22:11:45 1998
--- vm-mouse.el	Tue Jul 21 12:39:07 1998
***************
*** 215,216 ****
--- 215,218 ----
  
+ (defvar buffer-file-type)
+ 
  (defun vm-mouse-send-url-to-mosaic (url &optional new-mosaic new-window)
*** dist/vm-reply.el.dist	Mon Jul 13 11:05:12 1998
--- vm-reply.el	Mon Jul 20 12:56:41 1998
***************
*** 86,92 ****
  	(setq references
! 	      (cons (vm-get-header-contents (car mp) "References:" " ")
! 		    (cons (vm-get-header-contents (car mp) "In-reply-to:" " ")
! 			  (cons (vm-get-header-contents (car mp) "Message-ID:"
! 							" ")
! 				references))))
  	(setq newsgroups
--- 86,91 ----
  	(setq references
! 	      (cons (or (vm-get-header-contents (car mp) "References:" " ")
! 			(vm-get-header-contents (car mp) "In-reply-to:" " "))
! 		    (cons (vm-get-header-contents (car mp) "Message-ID:" " ")
! 			  references)))
  	(setq newsgroups
***************
*** 1110,1111 ****
--- 1109,1111 ----
  (defvar mail-signature-file)
+ (defvar mail-personal-alias-file)
  
*** dist/vm-startup.el.dist	Tue Jul 14 12:10:17 1998
--- vm-startup.el	Tue Jul 21 12:59:41 1998
***************
*** 295,297 ****
  
! This is VM 6.56.
  
--- 295,297 ----
  
! This is VM 6.57.
  
*** dist/vm-vars.el.dist	Tue Jul 14 12:10:18 1998
--- vm-vars.el	Tue Jul 21 12:39:41 1998
***************
*** 758,766 ****
  
! A value of 'best-internal means choose the best part that can be
! displayed internally, i.e. with the built-in capabilities of Emacs.
! If none of the parts can be displayed internally, behavior reverts to
! that of 'best.")
  
  (defvar vm-mime-default-face-charsets '("us-ascii" "iso-8859-1")
!   "*List of character sets that can use the `default' face.
  For other characters sets VM will have to create a new face and assign
--- 758,767 ----
  
! A value of 'best-internal means choose the best part that can
! be displayed internally, (i.e. with the built-in capabilities
! of Emacs) and is allowed to be displayed internally (see
! vm-mime-internal-content-types).  If none of the parts can be
! displayed internally, behavior reverts to that of 'best.")
  
  (defvar vm-mime-default-face-charsets '("us-ascii" "iso-8859-1")
!   "*List of character sets that can be dispalyed using the `default' face.
  For other characters sets VM will have to create a new face and assign
***************
*** 2417,2418 ****
--- 2418,2420 ----
  
+ (defvar lpr-command)
  (defvar vm-print-command (if (boundp 'lpr-command) lpr-command "lpr")
***************
*** 2420,2421 ****
--- 2422,2424 ----
  
+ (defvar lpr-switches)
  (defvar vm-print-command-switches (if (boundp 'lpr-switches) lpr-switches nil)
*** dist/vm-version.el.dist	Tue Jul 14 12:10:18 1998
--- vm-version.el	Tue Jul 21 12:59:40 1998
***************
*** 4,6 ****
  
! (defconst vm-version "6.56"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.57"
    "Version number of VM.")