(tsang-quick-converter): Fix broken line-ends from CVS before doing conversion.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 579604522d63f0d149d4c6765fc29060af332a6b..86bb9ddcf3c2e11f863afa2d93ea823944cd3eed 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-02  Jason Rumney  <jasonr@gnu.org>
+
+       * international/titdic-cnv.el (tsang-quick-converter): Fix broken
+       line-ends from CVS before doing conversion.
+
 2003-09-02  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
        * calendar/diary-lib.el (diary-header-line-flag)

diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 118fe2c2494b074d86c2b07e8278594629d2bc26..759df5fd949a60b5181c18935aca2f62ee5080ab 100644 (file)
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -768,6 +768,11 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"."
     (insert "(quail-define-rules\n")
     (save-excursion
       (set-buffer dicbuf)
+      ;; Handle double CR line ends, which result when checking out of
+      ;; CVS on MS-Windows.
+      (goto-char (point-min))
+      (while (re-search-forward "\r\r$" nil t)
+       (replace-match ""))
       (goto-char (point-min))
       (search-forward "A440")
       (beginning-of-line)