aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenichi Handa2007-02-24 01:26:22 +0000
committerKenichi Handa2007-02-24 01:26:22 +0000
commitbfd1426943601edbd4cd7abc90b8fac2cf0bd066 (patch)
treecb739b23c98387c29a6b922dfbf1f5da1a4c740c
parent948f751616e5c93e4bb8d6ec6d05d47f7e7cc7cb (diff)
downloademacs-bfd1426943601edbd4cd7abc90b8fac2cf0bd066.tar.gz
emacs-bfd1426943601edbd4cd7abc90b8fac2cf0bd066.zip
(utf-8-pre-write-conversion): Handle the
case that BEG is a string.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/international/utf-8.el8
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c6899bdbec8..164dc076dae 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12007-02-24 Kenichi Handa <handa@m17n.org>
2
3 * international/utf-8.el (utf-8-pre-write-conversion): Handle the
4 case that BEG is a string.
5
12007-02-24 Chris Moore <dooglus@gmail.com> 62007-02-24 Chris Moore <dooglus@gmail.com>
2 7
3 * pgg-pgp5.el (pgg-pgp5-encrypt-region): 8 * pgg-pgp5.el (pgg-pgp5-encrypt-region):
diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 2e4a2f6f49a..2d8791b49e3 100644
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -1008,9 +1008,11 @@ Also compose particular scripts if `utf-8-compose-scripts' is non-nil."
1008This is used as a post-read-conversion of utf-8 coding system." 1008This is used as a post-read-conversion of utf-8 coding system."
1009 (if (and utf-translate-cjk-mode 1009 (if (and utf-translate-cjk-mode
1010 (not utf-translate-cjk-lang-env) 1010 (not utf-translate-cjk-lang-env)
1011 (save-excursion 1011 (if (stringp beg)
1012 (goto-char beg) 1012 (string-match "\\cc\\|\\cj\\|\\ch" beg)
1013 (re-search-forward "\\cc\\|\\cj\\|\\ch" end t))) 1013 (save-excursion
1014 (goto-char beg)
1015 (re-search-forward "\\cc\\|\\cj\\|\\ch" end t))))
1014 (utf-translate-cjk-load-tables)) 1016 (utf-translate-cjk-load-tables))
1015 nil) 1017 nil)
1016 1018