*** dist/vm-mime.el.dist	Sun Mar 21 16:47:38 1999
--- vm-mime.el	Wed Apr  7 11:16:19 1999
***************
*** 1498,1499 ****
--- 1498,1500 ----
  	(buffer-read-only nil)
+ 	(m (vm-mm-layout-message layout))
  	(charset (or (vm-mime-get-parameter layout "charset") "us-ascii")))
***************
*** 1512,1516 ****
        (or no-highlighting (vm-energize-urls-in-message-region start end))
!       (if vm-fill-paragraphs-containing-long-lines
! 	  (let ((needmsg (> (- (vm-text-end-of (car vm-message-pointer))
! 			       (vm-text-of (car vm-message-pointer)))
  			    12000)))
--- 1513,1518 ----
        (or no-highlighting (vm-energize-urls-in-message-region start end))
!       (if (and vm-fill-paragraphs-containing-long-lines
! 	       (not no-highlighting))
! 	  (let ((needmsg (> (- (vm-text-end-of m)
! 			       (vm-text-of m))
  			    12000)))
***************
*** 3161,3162 ****
--- 3163,3166 ----
  			  'binary))
+ 		       ;; no transformations!
+ 		       (format-alist nil)
  		       ;; don't let buffer-file-coding-system be changed
***************
*** 3516,3517 ****
--- 3520,3523 ----
  			   'binary))
+ 			;; no transformations!
+ 			(format-alist nil)
  			;; don't let buffer-file-coding-system be
*** dist/vm-startup.el.dist	Sun Mar 21 16:47:41 1999
--- vm-startup.el	Thu Apr  8 00:19:14 1999
***************
*** 317,319 ****
  
! This is VM 6.70.
  
--- 317,319 ----
  
! This is VM 6.71.
  
***************
*** 478,479 ****
--- 478,481 ----
     vm-edit-message-hook
+    vm-fill-paragraphs-containing-long-lines
+    vm-flush-interval
     vm-folder-directory
***************
*** 976,977 ****
--- 978,980 ----
        'vm-edit-message-mode
+       'vm-fill-paragraphs-containing-long-lines
        'vm-flush-interval
*** dist/vm-undo.el.dist	Tue Jan 20 05:59:28 1998
--- vm-undo.el	Sat Mar 27 17:31:54 1999
***************
*** 379,381 ****
  "[\000-\040,\177-\377]*\\([^\000-\040,\177-\377]+\\)[\000-\040,\177-\377]*"))
! 	labels act-labels)
      (if (and add m-list)
--- 379,381 ----
  "[\000-\040,\177-\377]*\\([^\000-\040,\177-\377]+\\)[\000-\040,\177-\377]*"))
! 	labels act-labels m mm-list)
      (if (and add m-list)
***************
*** 395,396 ****
--- 395,414 ----
      (while m-list
+       (setq m (car m-list))
+       (if (and add (vm-virtual-message-p m))
+ 	  (let ((labels action-labels))
+ 	    (save-excursion
+ 	      (set-buffer (vm-buffer-of (vm-real-message-of m)))
+ 	      (while labels
+ 		(intern (car labels) vm-label-obarray)
+ 		(setq labels (cdr labels))))))
+       (if add
+ 	  (save-excursion
+ 	    (setq mm-list (vm-virtual-messages-of m))
+ 	    (while mm-list
+ 	      (let ((labels action-labels))
+ 		(set-buffer (vm-buffer-of (car mm-list)))
+ 		(while labels
+ 		  (intern (car labels) vm-label-obarray)
+ 		  (setq labels (cdr labels))))
+ 	      (setq labels (cdr labels)))))
        (setq act-labels action-labels
*** dist/vm-vars.el.dist	Sun Mar 21 16:47:42 1999
--- vm-vars.el	Thu Apr  8 00:17:56 1999
***************
*** 3510,3512 ****
      ("multipart" . "display parts")
!     ("message/partial" . "attempt message aseembly")
      ("message" . "display message")
--- 3510,3512 ----
      ("multipart" . "display parts")
!     ("message/partial" . "attempt message assembly")
      ("message" . "display message")
*** dist/vm-version.el.dist	Sun Mar 21 16:47:42 1999
--- vm-version.el	Thu Apr  8 00:19:13 1999
***************
*** 4,6 ****
  
! (defconst vm-version "6.70"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.71"
    "Version number of VM.")