aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuc Teirlinck2004-07-31 03:31:28 +0000
committerLuc Teirlinck2004-07-31 03:31:28 +0000
commit4bcce19cc188070e06d7655e47b94f5809413da5 (patch)
tree98348fb15cfddc0d14640b495d219038ff73d9b9
parent7c111482b974625610a81b698556a47d8dfa772b (diff)
downloademacs-4bcce19cc188070e06d7655e47b94f5809413da5.tar.gz
emacs-4bcce19cc188070e06d7655e47b94f5809413da5.zip
(utf-translate-cjk-mode): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/international/utf-8.el21
2 files changed, 16 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea1392783f6..d1ec8994edb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12004-07-30 Luc Teirlinck <teirllm@auburn.edu>
2
3 * international/utf-8.el (utf-translate-cjk-mode): Doc fix.
4
12004-07-28 Luc Teirlinck <teirllm@auburn.edu> 52004-07-28 Luc Teirlinck <teirllm@auburn.edu>
2 6
3 * custom.el (defcustom): Doc fix. 7 * custom.el (defcustom): Doc fix.
diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 77a51abb43f..bad79b58743 100644
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -273,7 +273,7 @@ The value nil means that the tables are not yet loaded.")
273 (utf-translate-cjk-load-tables)) 273 (utf-translate-cjk-load-tables))
274 (gethash code-point 274 (gethash code-point
275 (get 'utf-subst-table-for-decode 'translation-hash-table))) 275 (get 'utf-subst-table-for-decode 'translation-hash-table)))
276 276
277 277
278(defun utf-lookup-subst-table-for-encode (char) 278(defun utf-lookup-subst-table-for-encode (char)
279 (if (and utf-translate-cjk-mode 279 (if (and utf-translate-cjk-mode
@@ -282,9 +282,11 @@ The value nil means that the tables are not yet loaded.")
282 (utf-translate-cjk-load-tables)) 282 (utf-translate-cjk-load-tables))
283 (gethash char 283 (gethash char
284 (get 'utf-subst-table-for-encode 'translation-hash-table))) 284 (get 'utf-subst-table-for-encode 'translation-hash-table)))
285 285
286(define-minor-mode utf-translate-cjk-mode 286(define-minor-mode utf-translate-cjk-mode
287 "Whether the UTF based coding systems should decode/encode CJK characters. 287 "Toggle whether UTF based coding systems de/encode CJK characters.
288If ARG is an integer, enable if ARG is positive and disable if
289zero or negative. This is a minor mode.
288Enabling this allows the coding systems mule-utf-8, 290Enabling this allows the coding systems mule-utf-8,
289mule-utf-16le and mule-utf-16be to encode characters in the charsets 291mule-utf-16le and mule-utf-16be to encode characters in the charsets
290`korean-ksc5601', `chinese-gb2312', `chinese-big5-1', 292`korean-ksc5601', `chinese-gb2312', `chinese-big5-1',
@@ -296,9 +298,10 @@ according to the language environment in effect when this option is
296turned on: ksc5601 for Korean, gb2312 for Chinese-GB, big5 for 298turned on: ksc5601 for Korean, gb2312 for Chinese-GB, big5 for
297Chinese-Big5 and jisx for other environments. 299Chinese-Big5 and jisx for other environments.
298 300
299This option is on by default. If you are not interested in CJK 301This mode is on by default. If you are not interested in CJK
300characters and want to avoid some overhead on encoding/decoding 302characters and want to avoid some overhead on encoding/decoding
301by the above coding systems, you can customize this option to nil." 303by the above coding systems, you can customize the user option
304`utf-translate-cjk-mode' to nil."
302 :init-value t 305 :init-value t
303 :version "21.4" 306 :version "21.4"
304 :type 'boolean 307 :type 'boolean
@@ -605,7 +608,7 @@ eight-bit-control and eight-bit-graphic characters.")
605 ;; UTF-8 decoder generates an UTF-8 sequence represented by a 608 ;; UTF-8 decoder generates an UTF-8 sequence represented by a
606 ;; sequence eight-bit-control/graphic chars for an untranslatable 609 ;; sequence eight-bit-control/graphic chars for an untranslatable
607 ;; character and an invalid byte. 610 ;; character and an invalid byte.
608 ;; 611 ;;
609 ;; This CCL parses that sequence (the first byte is already in r1), 612 ;; This CCL parses that sequence (the first byte is already in r1),
610 ;; writes out the original bytes of that sequence, and sets r5 to 613 ;; writes out the original bytes of that sequence, and sets r5 to
611 ;; -1. 614 ;; -1.
@@ -624,7 +627,7 @@ eight-bit-control and eight-bit-graphic characters.")
624 (read-multibyte-character r5 r6) 627 (read-multibyte-character r5 r6)
625 (r0 = (r5 != ,(charset-id 'eight-bit-control))) 628 (r0 = (r5 != ,(charset-id 'eight-bit-control)))
626 (if ((r5 != ,(charset-id 'eight-bit-graphic)) & r0) 629 (if ((r5 != ,(charset-id 'eight-bit-graphic)) & r0)
627 ((write r1) ; invalid UTF-8 630 ((write r1) ; invalid UTF-8
628 (r1 = -1) 631 (r1 = -1)
629 (end))) 632 (end)))
630 633
@@ -641,7 +644,7 @@ eight-bit-control and eight-bit-graphic characters.")
641 (r1 = -1) 644 (r1 = -1)
642 ;; Read the 3rd byte. 645 ;; Read the 3rd byte.
643 (read-multibyte-character r5 r6) 646 (read-multibyte-character r5 r6)
644 (r0 = (r5 != ,(charset-id 'eight-bit-control))) 647 (r0 = (r5 != ,(charset-id 'eight-bit-control)))
645 (if ((r5 != ,(charset-id 'eight-bit-graphic)) & r0) 648 (if ((r5 != ,(charset-id 'eight-bit-graphic)) & r0)
646 (end)) ; invalid UTF-8 649 (end)) ; invalid UTF-8
647 (write r6) 650 (write r6)
@@ -651,7 +654,7 @@ eight-bit-control and eight-bit-graphic characters.")
651 (end))) 654 (end)))
652 ;; Read the 4th byte. 655 ;; Read the 4th byte.
653 (read-multibyte-character r5 r6) 656 (read-multibyte-character r5 r6)
654 (r0 = (r5 != ,(charset-id 'eight-bit-control))) 657 (r0 = (r5 != ,(charset-id 'eight-bit-control)))
655 (if ((r5 != ,(charset-id 'eight-bit-graphic)) & r0) 658 (if ((r5 != ,(charset-id 'eight-bit-graphic)) & r0)
656 (end)) ; invalid UTF-8 659 (end)) ; invalid UTF-8
657 ;; 4-byte sequence for an untranslated character. 660 ;; 4-byte sequence for an untranslated character.