--- a/lisp/vm/vm-misc.el	Mon Aug 13 09:15:13 2007 +0200
+++ b/lisp/vm/vm-misc.el	Mon Aug 13 09:15:49 2007 +0200
@@ -108,7 +108,7 @@
 	    ;; writing out message separators
 	    (setq buffer-file-type nil)
 	    ;; Tell XEmacs/MULE to pick the correct newline conversion.
-	    (and (fboundp 'set-file-coding-system)
+	    (and (vm-xemacs-mule-p)
 		 (set-file-coding-system 'no-conversion nil))
 	    (write-region (point-min) (point-max) where t 'quiet))
 	(and temp-buffer (kill-buffer temp-buffer))))))
@@ -349,8 +349,9 @@
 
 (defun vm-xemacs-mule-p ()
   (and (vm-xemacs-p)
+       (featurep 'mule)
        (fboundp 'set-file-coding-system)
-       (fboundp 'decode-coding-region)))
+       (fboundp 'get-coding-system)))
 
 (defun vm-fsfemacs-19-p ()
   (and (string-match "^19" emacs-version)
@@ -502,10 +503,6 @@
 	 (let ((o (make-extent start end)))
 	   (set-extent-property o 'face face)))))
 
-(defun vm-unsaved-message (&rest args)
-  (let ((message-log-max nil))
-    (apply (function message) args)))
-
 (defun vm-default-buffer-substring-no-properties (beg end &optional buffer)
   (let ((s (if buffer
 	       (save-excursion