[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/autoload.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/03/10 21:11:35

Index: emacs-lisp/autoload.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/autoload.el,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -b -r1.134 -r1.135
--- emacs-lisp/autoload.el      1 Feb 2008 16:01:26 -0000       1.134
+++ emacs-lisp/autoload.el      10 Mar 2008 21:11:31 -0000      1.135
@@ -484,14 +484,14 @@
            (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))
+          ;; 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))))
+           (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)