(autoload-find-destination): Don't force raw-text.

2 files changed, 8 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1df4a5f9d95..f5f9cfab8c6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2008-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * emacs-lisp/autoload.el (autoload-find-destination): Don't force raw-text.
+
         * calendar/calendar.el ("cal-loaddefs"): Load, rather than require.
         * calendar/cal-loaddefs.el: Don't version control.
 
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index efbe7a56927..dadb6aa0ea8 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -484,14 +484,14 @@ removes any prior now out-of-date autoload entries."
            (existing-buffer (if buffer-file-name buf))
            (found nil))
       (with-current-buffer
-          ;; We must read/write the file without any code conversion,
-          ;; but still decode EOLs.
-          (let ((coding-system-for-read 'raw-text))
-            (find-file-noselect
-             (autoload-ensure-default-file (autoload-generated-file))))
+          ;; We used to use `raw-text' to read this file, but this causes
+          ;; problems when the file contains non-ASCII characters.
+          (find-file-noselect
+           (autoload-ensure-default-file (autoload-generated-file)))
         ;; This is to make generated-autoload-file have Unix EOLs, so
         ;; that it is portable to all platforms.
-        (setq buffer-file-coding-system 'raw-text-unix)
+        (unless (zerop (coding-system-eol-type buffer-file-coding-system))
+          (set-buffer-file-coding-system 'unix))
         (or (> (buffer-size) 0)
             (error "Autoloads file %s does not exist" buffer-file-name))
         (or (file-writable-p buffer-file-name)