*** dist/vm-imap.el.dist	Thu Mar  1 20:17:41 2001
--- vm-imap.el	Fri Mar  2 09:36:24 2001
***************
*** 234,236 ****
  		  (vm-store-folder-totals source (list count 0 0 0))
! 		  (throw 'done (not (eq count 0))))
  		(not (equal 0 (car select)))))
--- 234,236 ----
  		  (vm-store-folder-totals source (list count 0 0 0))
! 		  (throw 'end-of-session (not (eq count 0))))
  		(not (equal 0 (car select)))))
*** dist/vm-mime.el.dist	Thu Mar  1 20:17:41 2001
--- vm-mime.el	Sun Mar 11 14:06:45 2001
***************
*** 805,807 ****
  			description (and description
! 					 (if (string-match "^[ \t\n]$"
  							   description)
--- 805,807 ----
  			description (and description
! 					 (if (string-match "^[ \t\n]*$"
  							   description)
***************
*** 834,836 ****
  				 "Content-Description:")
! 		    description (and description (if (string-match "^[ \t\n]+$"
  								   description)
--- 834,836 ----
  				 "Content-Description:")
! 		    description (and description (if (string-match "^[ \t\n]*$"
  								   description)
***************
*** 1706,1711 ****
        (cond ((or (null tempfile) (null (file-exists-p tempfile)))
! 	     (setq start (point))
! 	     (vm-mime-insert-mime-body layout)
! 	     (setq end (point-marker))
! 	     (vm-mime-transfer-decode-region layout start end)
  	     (setq suffix (vm-mime-extract-filename-suffix layout))
--- 1706,1728 ----
        (cond ((or (null tempfile) (null (file-exists-p tempfile)))
! 	     (cond (vm-fsfemacs-mule-p
! 		    (let (work-buffer (target (current-buffer)))
! 		      (unwind-protect
! 			  (progn
! 			    (setq work-buffer (vm-make-work-buffer))
! 			    (set-buffer work-buffer)
! 			    (vm-mime-insert-mime-body layout)
! 			    (vm-mime-transfer-decode-region layout
! 							    (point-min)
! 							    (point-max))
! 			    (set-buffer-multibyte t)
! 			    (set-buffer target)
! 			    (setq start (point))
! 			    (insert-buffer-substring work-buffer)
! 			    (setq end (point-marker)))
! 			(and work-buffer (kill-buffer work-buffer)))))
! 		   (t
! 		    (setq start (point))
! 		    (vm-mime-insert-mime-body layout)
! 		    (setq end (point-marker))
! 		    (vm-mime-transfer-decode-region layout start end)))
  	     (setq suffix (vm-mime-extract-filename-suffix layout))
***************
*** 2952,2956 ****
    (cond ((and vm-xemacs-mule-p (memq (device-type) '(x mswindows)))
! 	 (vm-string-assoc name vm-mime-mule-charset-to-coding-alist))
  	((and vm-fsfemacs-mule-p (memq window-system '(x win32 w32)))
! 	 (vm-string-assoc name vm-mime-mule-charset-to-coding-alist))
  	((vm-multiple-fonts-possible-p)
--- 2969,2975 ----
    (cond ((and vm-xemacs-mule-p (memq (device-type) '(x mswindows)))
! 	 (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist)
! 	     (vm-mime-default-face-charset-p name)))
  	((and vm-fsfemacs-mule-p (memq window-system '(x win32 w32)))
! 	 (or (vm-string-assoc name vm-mime-mule-charset-to-coding-alist)
! 	     (vm-mime-default-face-charset-p name)))
  	((vm-multiple-fonts-possible-p)
***************
*** 2998,3000 ****
  	      nil
! 	    (setq o (vm-mime-find-leaf-content-id id))
  	    (if (null o)
--- 3017,3019 ----
  	      nil
! 	    (setq o (vm-mime-find-leaf-content-id o id))
  	    (if (null o)
***************
*** 3836,3846 ****
  		       (buffer-file-coding-system (vm-binary-coding-system)))
! 		   (condition-case data
! 		       (insert-file-contents object)
! 		     (error
! 		      ;; font-lock could signal this error in FSF
! 		      ;; Emacs versions prior to 21.0.  Catch it
! 		      ;; and ignore it.
! 		      (if (equal data '(error "Invalid search bound (wrong side of point)"))
! 			  nil
! 			(signal (car data) (cdr data))))))))
  	  ;; gather information about the object from the extent.
--- 3855,3857 ----
  		       (buffer-file-coding-system (vm-binary-coding-system)))
! 		   (insert-file-contents object))))
  	  ;; gather information about the object from the extent.
***************
*** 4206,4208 ****
  		       (file-name-buffer-file-type-alist '(("." . t))))
! 		   (insert-file-contents object))
  		 (goto-char (point-max))
--- 4217,4227 ----
  		       (file-name-buffer-file-type-alist '(("." . t))))
! 		   (condition-case data
! 		       (insert-file-contents object)
! 		     (error
! 		      ;; font-lock could signal this error in FSF
! 		      ;; Emacs versions prior to 21.0.  Catch it
! 		      ;; and ignore it.
! 		      (if (equal data '(error "Invalid search bound (wrong side of point)"))
! 			  nil
! 			(signal (car data) (cdr data))))))
  		 (goto-char (point-max))
*** dist/vm-misc.el.dist	Tue Jan  9 22:51:32 2001
--- vm-misc.el	Sun Mar 11 12:15:34 2001
***************
*** 749,751 ****
  	(fill-column vm-paragraph-fill-column)
! 	;; user doesn't want long line, so set this to zero for them.
  	(filladapt-fill-column-forward-fuzz 0))
--- 749,751 ----
  	(fill-column vm-paragraph-fill-column)
! 	;; user doesn't want long lines, so set this to zero for them.
  	(filladapt-fill-column-forward-fuzz 0))
***************
*** 759,761 ****
  	 (if (>= (current-column) len)
! 	     (fill-paragraph nil))
  	 (forward-line)
--- 759,764 ----
  	 (if (>= (current-column) len)
! 	     ;; ignore errors
! 	     (condition-case nil
! 		 (fill-paragraph nil)
! 	       (error nil)))
  	 (forward-line)
*** dist/vm-startup.el.dist	Thu Mar  1 20:17:42 2001
--- vm-startup.el	Sun Mar 11 15:56:55 2001
***************
*** 341,343 ****
  
! This is VM 6.91.
  
--- 341,343 ----
  
! This is VM 6.92.
  
*** dist/vm-summary.el.dist	Thu Mar  1 20:17:42 2001
--- vm-summary.el	Fri Mar  9 12:21:30 2001
***************
*** 792,794 ****
  ;; because such malformed headers have been observed.
! "\\(\\([a-z][a-z][a-z]\\),\\)?[ \t\n]*\\([0-9][0-9]?\\)[ \t\n---]*\\([a-z][a-z][a-z]\\)[ \t\n---]*\\([0-9]*[0-9][0-9]\\)[ \t\n]*\\([0-9:]+\\)[ \t\n]*\\([a-z][a-z]?[a-z]?\\|[---+]?[0-9][0-9][0-9][0-9]\\)"
         date)
--- 792,794 ----
  ;; because such malformed headers have been observed.
! "\\(\\([a-z][a-z][a-z]\\),\\)?[ \t\n]*\\([0-9][0-9]?\\)[ \t\n---]*\\([a-z][a-z][a-z]\\)[ \t\n---]*\\([0-9]*[0-9][0-9]\\)[ \t\n]*\\([0-9:]+\\)[ \t\n]*\\([a-z][a-z]?[a-z]?\\|\\(-\\|\\+\\)[01][0-9][0-9][0-9]\\)"
         date)
***************
*** 808,810 ****
  ;; the possibility of a timezone at the end.
! "\\([a-z][a-z][a-z]\\)[ \t\n]*\\([a-z][a-z][a-z]\\)[ \t\n]*\\([0-9][0-9]?\\)[ \t\n]*\\([0-9:]+\\)[ \t\n]*\\([0-9][0-9][0-9][0-9]\\)[ \t\n]*\\([a-z][a-z]?[a-z]?\\|[---+][0-9][0-9][0-9][0-9]\\)?"
         date)
--- 808,810 ----
  ;; the possibility of a timezone at the end.
! "\\([a-z][a-z][a-z]\\)[ \t\n]*\\([a-z][a-z][a-z]\\)[ \t\n]*\\([0-9][0-9]?\\)[ \t\n]*\\([0-9:]+\\)[ \t\n]*\\([0-9][0-9][0-9][0-9]\\)[ \t\n]*\\([a-z][a-z]?[a-z]?\\|\\(-\\|\\+\\)[01][0-9][0-9][0-9]\\)?"
         date)
***************
*** 985,986 ****
--- 985,987 ----
  		 (vm-get-header-contents m "Apparently-To:" ", ")
+ 		 (vm-get-header-contents m "Newsgroups:" ", ")
  		 ;; desperation....
*** dist/vm-version.el.dist	Thu Mar  1 20:17:42 2001
--- vm-version.el	Sun Mar 11 15:56:55 2001
***************
*** 4,6 ****
  
! (defconst vm-version "6.91"
    "Version number of VM.")
--- 4,6 ----
  
! (defconst vm-version "6.92"
    "Version number of VM.")