(titdic-convert): Force files be

written with Unix-like eol format.  Read files under CXTERM-DIC by
raw-text.
(miscdic-convert): Force files be written with Unix-like eol
format.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4943d6e6285cf652cc041c2d08993b5103ce0bc4..aaacef8e080c8aac5f0275752fdc349647ef560e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2007-02-11  Kenichi Handa  <handa@m17n.org>
+
+       * international/titdic-cnv.el (titdic-convert): Force files be
+       written with Unix-like eol format.  Read files under CXTERM-DIC by
+       raw-text.
+       (miscdic-convert): Force files be written with Unix-like eol
+       format.
+
 2007-02-11  Juanma Barranquero  <lekktu@gmail.com>
 
        * files.el (change-major-mode-with-file-name): Fix typo in docstring.

diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index c8a1155b0f34366fbb05d40807b73ebd4d3286ed..ed5df5b95922a8eb39cee7d801a4d384e9be77c3 100644 (file)
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -471,13 +471,16 @@ SPC, 6, 3, 4, or 7 specifing a tone (SPC:\e$(0?v(N\e(B, 6:\e$(0Dm(N\e(B, 3:\e$(0&9Vy\e
 Optional argument DIRNAME if specified is the directory name under which
 the generated Quail package is saved."
   (interactive "FTIT dictionary file: ")
-  (let ((coding-system-for-write 'iso-2022-7bit))
+  (let ((coding-system-for-write 'iso-2022-7bit-unix))
     (with-temp-file  (tit-make-quail-package-file-name filename dirname)
-      (set-buffer-file-coding-system 'iso-2022-7bit)
+      ;; Explicitly speficy eol format to `unix'.
+      (set-buffer-file-coding-system 'iso-2022-7bit-unix)
       (let ((standard-output (current-buffer)))
        (with-temp-buffer
          (set-buffer-multibyte nil)
-         (let ((coding-system-for-read 'no-conversion))
+         ;; Here we must use `raw-text' instead of `no-conversion' to
+         ;; enable auto-decoding of eol format (CRLF->LF).
+         (let ((coding-system-for-read 'raw-text))
            (insert-file-contents (expand-file-name filename)))
 
          ;; Decode the buffer contents from the encoding specified by a
@@ -1145,7 +1148,8 @@ the generated Quail package is saved."
              copyright (nth 6 slot))
        (message "Converting %s to %s..." dicfile quailfile)
        (with-temp-file (expand-file-name quailfile dirname)
-         (set-buffer-file-coding-system 'iso-2022-7bit)
+         ;; Explicitly speficy eol format to `unix'.
+         (set-buffer-file-coding-system 'iso-2022-7bit-unix)
          (insert ";; Quail package `" name "' -*- coding:iso-2022-7bit; ")
          (insert "byte-compile-disable-print-circle:t; -*-\n");
          (insert ";;   Generated by the command `miscdic-convert'\n")