(update-file-autoloads): Use raw-text to

read generated-autoload-file, and set buffer-file-coding-system to
raw-text-unix after reading the file.

2 files changed, 17 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index af051ff06bd..bf9c0c33b03 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2000-12-06  Eli Zaretskii  <eliz@is.elta.co.il>
+
+	* emacs-lisp/autoload.el (update-file-autoloads): Use raw-text to
+	read generated-autoload-file, and set buffer-file-coding-system to
+	raw-text-unix after reading the file.
+
+	* international/mule-conf.el (file-coding-system-alist): Use
+	raw-text for reading loaddefs.el and raw-text-unix for writing
+	it.
+
 2000-12-06  Gerd Moellmann  <gerd@gnu.org>
 
 	* cus-start.el: Add entry for even-window-heights.
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 3928ee1a747..7be1e71f466 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -376,12 +376,16 @@ are used."
       ;; the local variables section if it's there.
       (if existing-buffer
 	  (set-buffer existing-buffer))
-      ;; We must read/write the file without any code conversion.
-      (let ((coding-system-for-read 'no-conversion))
+      ;; We must read/write the file without any code conversion,
+      ;; but still decode EOLs.
+      (let ((coding-system-for-read 'raw-text))
 	(set-buffer (find-file-noselect
 		     (expand-file-name generated-autoload-file
 				       (expand-file-name "lisp"
-							 source-directory)))))
+							 source-directory))))
+	;; 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))
       (or (> (buffer-size) 0)
 	  (error "Autoloads file %s does not exist" buffer-file-name))
       (or (file-writable-p buffer-file-name)