*** dist/vm-mime.el.dist	Fri Feb  5 01:41:59 1999
--- vm-mime.el	Sun Feb  7 17:51:26 1999
***************
*** 20,21 ****
--- 20,22 ----
  (defvar enable-multibyte-characters)
+ (defvar default-enable-multibyte-characters)
  
***************
*** 182,184 ****
  	(save-excursion
! 	  (setq work-buffer (generate-new-buffer " *vm-work*"))
  	  (buffer-disable-undo work-buffer)
--- 183,186 ----
  	(save-excursion
! 	  (let ((default-enable-multibyte-characters nil))
! 	    (setq work-buffer (generate-new-buffer " *vm-work*")))
  	  (buffer-disable-undo work-buffer)
***************
*** 256,258 ****
  	(save-excursion
! 	  (setq work-buffer (generate-new-buffer " *vm-work*"))
  	  (buffer-disable-undo work-buffer)
--- 258,261 ----
  	(save-excursion
! 	  (let ((default-enable-multibyte-characters nil))
! 	    (setq work-buffer (generate-new-buffer " *vm-work*")))
  	  (buffer-disable-undo work-buffer)
***************
*** 339,341 ****
  	(save-excursion
! 	  (setq work-buffer (generate-new-buffer " *vm-work*"))
  	  (buffer-disable-undo work-buffer)
--- 342,345 ----
  	(save-excursion
! 	  (let ((default-enable-multibyte-characters nil))
! 	    (setq work-buffer (generate-new-buffer " *vm-work*")))
  	  (buffer-disable-undo work-buffer)
***************
*** 419,421 ****
  	(save-excursion
! 	  (setq work-buffer (generate-new-buffer " *vm-work*"))
  	  (buffer-disable-undo work-buffer)
--- 423,426 ----
  	(save-excursion
! 	  (let ((default-enable-multibyte-characters nil))
! 	    (setq work-buffer (generate-new-buffer " *vm-work*")))
  	  (buffer-disable-undo work-buffer)
***************
*** 498,500 ****
  	(save-excursion
! 	  (setq work-buffer (generate-new-buffer " *vm-work*"))
  	  (set-buffer work-buffer)
--- 503,506 ----
  	(save-excursion
! 	  (let ((default-enable-multibyte-characters nil))
! 	    (setq work-buffer (generate-new-buffer " *vm-work*")))
  	  (set-buffer work-buffer)
***************
*** 867,868 ****
--- 873,875 ----
  		    (nreverse multipart-list)
+ 		    nil
  		    (vm-mime-make-message-symbol m)
***************
*** 875,877 ****
    (condition-case error-data
!       (vm-mime-parse-entity nil c-t c-t-e)
      (vm-mime-error
--- 882,884 ----
    (condition-case error-data
!       (vm-mime-parse-entity m c-t c-t-e passing-message-only)
      (vm-mime-error
***************
*** 2215,2217 ****
  		(coding-system-for-write 'binary))
! 	    (setq work-buffer (generate-new-buffer " *vm-work*"))
  	    (buffer-disable-undo work-buffer)
--- 2222,2225 ----
  		(coding-system-for-write 'binary))
! 	    (let ((default-enable-multibyte-characters nil))
! 	      (setq work-buffer (generate-new-buffer " *vm-work*")))
  	    (buffer-disable-undo work-buffer)
***************
*** 2250,2252 ****
  	  (progn
! 	    (setq work-buffer (generate-new-buffer " *vm-work*"))
  	    ;; call-process-region calls write-region.
--- 2258,2261 ----
  	  (progn
! 	    (let ((default-enable-multibyte-characters nil))
! 	      (setq work-buffer (generate-new-buffer " *vm-work*")))
  	    ;; call-process-region calls write-region.
***************
*** 2721,2722 ****
--- 2730,2733 ----
        (set-buffer buf)
+       (if vm-fsfemacs-mule-p
+ 	  (set-buffer-multibyte nil))
        (vm-insert-region-from-buffer folder (vm-headers-of m)
***************
*** 3145,3149 ****
  		 (if (not already-mimed)
! 		     (setq layout (vm-mime-parse-entity
! 				   nil (list "text/plain" "charset=us-ascii")
! 				   "7bit")))
  		 (setq encoding (vm-mime-transfer-encode-layout layout))
--- 3156,3167 ----
  		 (if (not already-mimed)
! 		     (progn
! 		       (goto-char (point-min))
! 		       (insert "Content-Type: " type "\n")
! 		       ;; vm-mime-trasnfer-encode-layout will replace
! 		       ;; this if the transfer encoding changes.
! 		       (insert "Content-Transfer-Encoding: 7bit\n\n")
! 		       (setq already-mimed t)))
! 		 (setq layout (vm-mime-parse-entity
! 			       nil (list "text/plain" "charset=us-ascii")
! 			       "7bit"))
  		 (setq encoding (vm-mime-transfer-encode-layout layout))
***************
*** 3342,3345 ****
  	     (if vm-fsfemacs-mule-p
! 		 (encode-coding-region (point-min) (point-max)
! 				       buffer-file-coding-system))
  	     (setq encoding (vm-determine-proper-content-transfer-encoding
--- 3360,3370 ----
  	     (if vm-fsfemacs-mule-p
! 		 (let ((coding-system
! 			(car (cdr (vm-string-assoc
! 				   charset
! 				   vm-mime-mule-charset-to-coding-alist)))))
! 		   (if (null coding-system)
! 		       (error "Can't find a coding system for charset %s"
! 			      charset)
! 		     (encode-coding-region (point-min) (point-max)
! 					   coding-system))))
  	     (setq encoding (vm-determine-proper-content-transfer-encoding
***************
*** 3387,3390 ****
  	     (if vm-fsfemacs-mule-p
! 		 (encode-coding-region (point-min) (point-max)
! 				       buffer-file-coding-system))
  	     (setq encoding (vm-determine-proper-content-transfer-encoding
--- 3412,3422 ----
  	     (if vm-fsfemacs-mule-p
! 		 (let ((coding-system
! 			(car (cdr (vm-string-assoc
! 				   charset
! 				   vm-mime-mule-charset-to-coding-alist)))))
! 		   (if (null coding-system)
! 		       (error "Can't find a coding system for charset %s"
! 			      charset)
! 		     (encode-coding-region (point-min) (point-max)
! 					   coding-system))))
  	     (setq encoding (vm-determine-proper-content-transfer-encoding
***************
*** 3485,3489 ****
  		  (if (not already-mimed)
! 		      (setq layout (vm-mime-parse-entity
! 				    nil (list "text/plain" "charset=us-ascii")
! 				    "7bit")))
  		  (setq encoding (vm-mime-transfer-encode-layout layout))
--- 3517,3528 ----
  		  (if (not already-mimed)
! 		      (progn
! 			(goto-char (point-min))
! 			(insert "Content-Type: " type "\n")
! 			;; vm-mime-trasnfer-encode-layout will replace
! 			;; this if the transfer encoding changes.
! 			(insert "Content-Transfer-Encoding: 7bit\n\n")
! 			(setq already-mimed t)))
! 		  (setq layout (vm-mime-parse-entity
! 				nil (list "text/plain" "charset=us-ascii")
! 				"7bit"))
  		  (setq encoding (vm-mime-transfer-encode-layout layout))
***************
*** 3551,3554 ****
  	   (if vm-fsfemacs-mule-p
! 	       (encode-coding-region (point) (point-max)
! 				     buffer-file-coding-system))
  	   (setq encoding (vm-determine-proper-content-transfer-encoding
--- 3590,3600 ----
  	   (if vm-fsfemacs-mule-p
! 	       (let ((coding-system
! 		      (car (cdr (vm-string-assoc
! 				 charset
! 				 vm-mime-mule-charset-to-coding-alist)))))
! 		 (if (null coding-system)
! 		     (error "Can't find a coding system for charset %s"
! 			    charset)
! 		   (encode-coding-region (point) (point-max)
! 					 coding-system))))
  	   (setq encoding (vm-determine-proper-content-transfer-encoding
*** dist/vm-startup.el.dist	Fri Feb  5 01:42:01 1999
--- vm-startup.el	Sun Feb  7 18:10:16 1999
***************
*** 317,319 ****
  
! This is VM 6.66.
  
--- 317,319 ----
  
! This is VM 6.67.
  
***************
*** 1168,1170 ****
  	      (= emacs-major-version 20)
! 	      (< emacs-minor-version 3))
  	 (error "VM must be run on Emacs 20.3 or a later v20 version."))))
--- 1168,1170 ----
  	      (= emacs-major-version 20)
! 	      (< emacs-minor-version 4))
  	 (error "VM must be run on Emacs 20.3 or a later v20 version."))))
*** dist/vm-version.el.dist	Fri Feb  5 01:42:02 1999
--- vm-version.el	Sun Feb  7 18:10:15 1999
***************
*** 4,6 ****
  
! (defconst vm-version "6.66"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.67"
    "Version number of VM.")