--- a/lisp/vm/vm-startup.el	Mon Aug 13 09:30:13 2007 +0200
+++ b/lisp/vm/vm-startup.el	Mon Aug 13 09:31:12 2007 +0200
@@ -63,7 +63,7 @@
 			    (inhibit-local-variables t)
 			    (enable-local-variables nil)
 			    ;; for XEmacs/Mule
-			    (coding-system-for-read 'no-conversion))
+			    (overriding-file-coding-system 'no-conversion))
 			(message "Reading %s..." file)
 			(prog1 (find-file-noselect file)
 			  ;; update folder history
@@ -80,25 +80,25 @@
       ;; the file coding system and decoding it.
       ;; This is only possible if a file is visited and then vm-mode
       ;; is run on it afterwards.
-      (defvar buffer-file-coding-system)
+      (defvar file-coding-system)
       (if (and vm-xemacs-mule-p
-	       (not (eq (get-coding-system buffer-file-coding-system)
+	       (not (eq (get-coding-system file-coding-system)
 			(get-coding-system 'no-conversion-unix)))
-	       (not (eq (get-coding-system buffer-file-coding-system)
+	       (not (eq (get-coding-system file-coding-system)
 			(get-coding-system 'no-conversion-dos)))
-	       (not (eq (get-coding-system buffer-file-coding-system)
+	       (not (eq (get-coding-system file-coding-system)
 			(get-coding-system 'no-conversion-mac)))
-	       (not (eq (get-coding-system buffer-file-coding-system)
+	       (not (eq (get-coding-system file-coding-system)
 			(get-coding-system 'binary))))
 	  (let ((buffer-read-only nil)
 		(omodified (buffer-modified-p)))
 	    (unwind-protect
 		(progn
 		  (encode-coding-region (point-min) (point-max)
-					buffer-file-coding-system)
-		  (set-buffer-file-coding-system 'no-conversion nil)
+					file-coding-system)
+		  (set-file-coding-system 'no-conversion nil)
 		  (decode-coding-region (point-min) (point-max)
-					buffer-file-coding-system))
+					file-coding-system))
 	      (set-buffer-modified-p omodified))))
       (vm-check-for-killed-summary)
       (vm-check-for-killed-presentation)
@@ -276,7 +276,7 @@
 (defun vm-mode (&optional read-only)
   "Major mode for reading mail.
 
-This is VM 6.27.
+This is VM 6.29.
 
 Commands:
    h - summarize folder contents
@@ -1011,7 +1011,7 @@
       )
      nil
      nil
-     "Please change the Subject header to a concise bug description.\nRemember to cover the basics, that is, what you expected to\nhappen and what in fact did happen.  Please remove these instructions from your message.")
+     "Please change the Subject header to a concise bug description.\nRemember to cover the basics, that is, what you expected to\nhappen and what in fact did happen.  Please remove these\ninstructions from your message.")
     (save-excursion
       (goto-char (point-min))
       (mail-position-on-field "Subject")
@@ -1055,7 +1055,7 @@
 (defun vm-session-initialization ()
   (vm-note-emacs-version)
   (vm-check-emacs-version)
-  ;(vm-set-debug-flags)
+;;  (vm-set-debug-flags)
   ;; If this is the first time VM has been run in this Emacs session,
   ;; do some necessary preparations.
   (if (or (not (boundp 'vm-session-beginning))