summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2003-09-02 22:20:29 +0000
committerJason Rumney <jasonr@gnu.org>2003-09-02 22:20:29 +0000
commit6ed24d2e3571dd112db3cd149531c26a37cb37b5 (patch)
tree0b06c21c8a276a038fdc035edff39ec708939271
parenta2fcf0296f411f5658bfb1445233e8a58ecbc281 (diff)
downloademacs-6ed24d2e3571dd112db3cd149531c26a37cb37b5.tar.gz
(tsang-quick-converter): Fix broken line-ends from CVS before doing conversion.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/titdic-cnv.el5
2 files changed, 10 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 579604522d6..86bb9ddcf3c 100644
--- 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 118fe2c2494..759df5fd949 100644
--- 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)