changeset 92710:123ee50ab055

(autoload-find-destination): Don't force raw-text.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 10 Mar 2008 21:11:32 +0000
parents 5b93735ecb98
children ecb1c0e60608
files lisp/ChangeLog lisp/emacs-lisp/autoload.el
diffstat 2 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Mon Mar 10 14:04:25 2008 +0000
+++ b/lisp/ChangeLog	Mon Mar 10 21:11:32 2008 +0000
@@ -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.
 
--- a/lisp/emacs-lisp/autoload.el	Mon Mar 10 14:04:25 2008 +0000
+++ b/lisp/emacs-lisp/autoload.el	Mon Mar 10 21:11:32 2008 +0000
@@ -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))
-            (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)