*** dist/vm-mime.el.dist	Thu Mar 18 18:42:13 1999
--- vm-mime.el	Sat Mar 20 23:42:33 1999
***************
*** 1029,1030 ****
--- 1029,1031 ----
  	(let ((buffer-read-only nil)
+ 	      (inhibit-read-only t)
  	      (modified (buffer-modified-p)))
***************
*** 1479,1485 ****
  	     (w3-region start end)
! 	     (setq end (+ end (- (buffer-size) buffer-size))))
! 	    ;; remove read-only text properties
! 	    (let ((inhibit-read-only t))
! 	      (remove-text-properties start end '(read-only nil)))
! 	    (goto-char end)
  	    (message "Inlining text/html... done")
--- 1480,1486 ----
  	     (w3-region start end)
! 	     (setq end (+ end (- (buffer-size) buffer-size)))
! 	     ;; remove read-only text properties
! 	     (let ((inhibit-read-only t))
! 	       (remove-text-properties start end '(read-only nil)))
! 	     (goto-char end))
  	    (message "Inlining text/html... done")
***************
*** 1511,1512 ****
--- 1512,1524 ----
        (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)))
+ 	    (if needmsg
+ 		(message "Searching for paragraphs to fill..."))
+ 	    (vm-fill-paragraphs-containing-long-lines
+ 	     vm-fill-paragraphs-containing-long-lines
+ 	     start end)
+ 	    (if needmsg
+ 		(message "Searching for paragraphs to fill... done"))))
        (goto-char end)
***************
*** 2181,2183 ****
  	    (set-keymap-parents keymap (list (current-local-map))))
!       (setq keymap (nconc keymap (current-local-map))))
      (if (not (bolp))
--- 2193,2195 ----
  	    (set-keymap-parents keymap (list (current-local-map))))
!       (setq keymap (append keymap (current-local-map))))
      (if (not (bolp))
*** dist/vm-misc.el.dist	Thu Mar 18 18:42:13 1999
--- vm-misc.el	Sat Mar 20 17:19:02 1999
***************
*** 690 ****
--- 690,708 ----
      (replace-match " " t t)))
+ 
+ (defun vm-fill-paragraphs-containing-long-lines (len start end)
+   (let ((done nil)
+ 	(buffer-read-only nil)
+ 	(fill-column (1- len))
+ 	;; user doesn't want long line, so set this to zero for them.
+ 	(filladapt-fill-column-forward-fuzz 0))
+     (save-excursion
+       (vm-save-restriction
+        (widen)
+        (or (markerp end) (setq end (vm-marker end)))
+        (goto-char start)
+        (while (not done)
+ 	 (re-search-forward "$" end t)
+ 	 (if (>= (current-column) len)
+ 	     (fill-paragraph nil))
+ 	 (forward-line)
+ 	 (setq done (>= (point) end)))))))
*** dist/vm-page.el.dist	Wed Apr  8 10:38:40 1998
--- vm-page.el	Sat Mar 20 23:43:47 1999
***************
*** 555,556 ****
--- 555,557 ----
     (if (or vm-mime-display-function
+ 	   (natnump vm-fill-paragraphs-containing-long-lines)
  	   (and vm-display-using-mime
***************
*** 605,606 ****
--- 606,620 ----
  			(message "%s" (car (cdr data))))))
+   (if (and (natnump vm-fill-paragraphs-containing-long-lines)
+ 	   (vm-mime-plain-message-p (car vm-message-pointer)))
+       (let ((needmsg (> (- (vm-text-end-of (car vm-message-pointer))
+ 			   (vm-text-of (car vm-message-pointer)))
+ 			12000)))
+ 	(if needmsg
+ 	    (message "Searching for paragraphs to fill..."))
+ 	(vm-fill-paragraphs-containing-long-lines
+ 	 vm-fill-paragraphs-containing-long-lines
+ 	 (vm-text-of (car vm-message-pointer))
+ 	 (vm-text-end-of (car vm-message-pointer)))
+ 	(if needmsg
+ 	    (message "Searching for paragraphs to fill... done"))))
    (vm-save-buffer-excursion
*** dist/vm-startup.el.dist	Thu Mar 18 18:42:15 1999
--- vm-startup.el	Sun Mar 21 16:36:43 1999
***************
*** 317,319 ****
  
! This is VM 6.69.
  
--- 317,319 ----
  
! This is VM 6.70.
  
*** dist/vm-vars.el.dist	Thu Mar 18 18:42:17 1999
--- vm-vars.el	Sat Mar 20 23:50:02 1999
***************
*** 541,542 ****
--- 541,549 ----
  
+ (defvar vm-fill-paragraphs-containing-long-lines nil
+   "*Non-nil numeric value N causes VM to fill paragraphs that
+ contain lines spanning N columns or more.  Only plain text
+ messages and text/plain MIME parts will be filled.  The message
+ itself is not modified; its text is copied into a presentation
+ buffer before the filling is done.")
+ 
  (defvar vm-display-using-mime t
*** dist/vm-version.el.dist	Thu Mar 18 18:42:17 1999
--- vm-version.el	Sun Mar 21 16:36:43 1999
***************
*** 4,6 ****
  
! (defconst vm-version "6.69"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.70"
    "Version number of VM.")