[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master f2bd2c1: Fix minor problems with loaddefs autogener
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] master f2bd2c1: Fix minor problems with loaddefs autogeneration |
Date: |
Sat, 4 Mar 2017 06:24:44 -0500 (EST) |
branch: master
commit f2bd2c1e6476acc71e71f6cb2a1c56c5edd900ba
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix minor problems with loaddefs autogeneration
* admin/ldefs-clean.el (ldefs-clean): Bind coding-system-for-read
and coding-system-for-write, to produce a UTF-8 file with Unix
EOLs on MS-Windows.
* lisp/ldefs-boot-manual.el (image-type): Add autoload cookie.
---
admin/ldefs-clean.el | 7 +++++--
lisp/ldefs-boot-manual.el | 3 +++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/admin/ldefs-clean.el b/admin/ldefs-clean.el
index 91512b4..33bc9e5 100644
--- a/admin/ldefs-clean.el
+++ b/admin/ldefs-clean.el
@@ -57,6 +57,9 @@
(defun ldefs-clean ()
- (find-file "../lisp/ldefs-boot-auto.temp")
+ ;; 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"))
(ldefs-clean-up)
- (write-file "ldefs-boot-auto.el"))
+ (let ((coding-system-for-write 'utf-8-unix))
+ (write-file "ldefs-boot-auto.el")))
diff --git a/lisp/ldefs-boot-manual.el b/lisp/ldefs-boot-manual.el
index 2f6e3fd..06b9738 100644
--- a/lisp/ldefs-boot-manual.el
+++ b/lisp/ldefs-boot-manual.el
@@ -16,6 +16,9 @@
(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")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master f2bd2c1: Fix minor problems with loaddefs autogeneration,
Eli Zaretskii <=