Revert "Fix minor problems with loaddefs autogeneration"

This reverts commit f2bd2c1e6476acc71e71f6cb2a1c56c5edd900ba.

This commit has been reverted because the new mechanism was too
sensitive to changes in the lisp source, generation of new ldefs-boot
files was platform specific and resulted in warnings about undefined
variables.

2 files changed, 2 insertions, 8 deletions

diff --git a/admin/ldefs-clean.el b/admin/ldefs-clean.el
index 33bc9e529fa..91512b4bbb7 100644
--- a/admin/ldefs-clean.el
+++ b/admin/ldefs-clean.el
@@ -57,9 +57,6 @@
 
 
 (defun ldefs-clean ()
-  ;; Remove CR characters produced on MS-DOS/MS-Windows systems.
-  (let ((coding-system-for-read 'utf-8-dos))
-    (find-file "../lisp/ldefs-boot-auto.temp"))
+  (find-file "../lisp/ldefs-boot-auto.temp")
   (ldefs-clean-up)
-  (let ((coding-system-for-write 'utf-8-unix))
-    (write-file "ldefs-boot-auto.el")))
+  (write-file "ldefs-boot-auto.el"))
diff --git a/lisp/ldefs-boot-manual.el b/lisp/ldefs-boot-manual.el
index 06b9738d5ee..2f6e3fd2094 100644
--- a/lisp/ldefs-boot-manual.el
+++ b/lisp/ldefs-boot-manual.el
@@ -16,9 +16,6 @@
 (autoload 'dos-convert-standard-filename "dos-fns.el" nil nil nil)
 (autoload 'w32-convert-standard-filename "w32-fns.el" nil nil nil)
 
-;; This is needed on MS-Windows only, and won't be in
-;; ldefs-boot-auto.el on other platforms.
-(autoload 'image-type "image" nil nil nil)
 
 (load "ldefs-boot-auto.el")