--- a/lisp/ChangeLog	Fri Mar 05 07:16:22 2010 -0600
+++ b/lisp/ChangeLog	Fri Mar 05 07:20:26 2010 -0600
@@ -31,6 +31,21 @@
 	Don't call (decode-char ... 'ucs) here, it can make bootstrapping
 	harder.
 
+2010-02-26  Ben Wing  <ben@xemacs.org>
+
+	* autoload.el (autoload-featurep-protect-autoloads):
+	Always insert a coding-system cookie, either raw-text-unix or
+	escape-quoted.  As before, insert an error statement when an
+	escape-quoted auto-autoload is loaded in a non-Mule XEmacs.
+
+	This fixes problems when the default coding system is UTF-8,
+	as in Cygwin.  Under some circumstances, the file can get
+	written out as raw text and read in as UTF-8, where invididual
+	high-bytes are usually invalid UTF-8 sequences and lead to
+	error octets in the buffer; when written out again, these
+	force escape-quoted.  Result: auto-autoloads.el for the
+	source-tree lisp/ directory would end up as escape-quoted.
+
 2010-02-25  Didier Verna  <didier@xemacs.org>
 
 	The background-placement face property.
@@ -49,7 +64,7 @@
 	* frame.el (frame-background-placement-instance):
 	* objects.el (make-face-background-placement-specifier): New.
 
-c2010-02-25  Ben Wing  <ben@xemacs.org>
+2010-02-25  Ben Wing  <ben@xemacs.org>
 
 	* autoload.el (make-autoload):
 	Call cl-function-arglist with one arg.

--- a/lisp/autoload.el	Fri Mar 05 07:16:22 2010 -0600
+++ b/lisp/autoload.el	Fri Mar 05 07:20:26 2010 -0600
@@ -1088,11 +1088,13 @@
 	   ;; recognized only one of the two magic-cookie styles (the -*- kind)
 	   ;; in find-file, but both of them in load.  We go ahead and put both
 	   ;; in, just to be safe.
+	   (insert (format " -*- coding: %s -*-\n" buffer-file-coding-system))
 	   (when (eq buffer-file-coding-system 'escape-quoted)
-	     (insert " -*- coding: escape-quoted; -*-
-\(or (featurep 'mule) (error \"Loading this file requires Mule support\"))
-;;;###coding system: escape-quoted"))
-	   (insert "\n(if (featurep '" sym ")")
+	     (insert "(or (featurep 'mule) ")
+	     (insert "(error \"Loading this file requires Mule support\"))\n"))
+	   (insert (format ";;;###coding system: %s\n"
+			   buffer-file-coding-system))
+	   (insert "(if (featurep '" sym ")")
 	   (insert " (error \"Feature " sym " already loaded\"))\n")
 	   (goto-char (point-max))
 	   (save-excursion