From 1e7f6327e3311487515d0b92bd36de08a691c90b Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Wed, 4 Sep 2002 08:17:23 +0000 Subject: [PATCH] (decode-char): Translate a character by utf-8-translation-table-for-decode only when utf-8-fragment-on-decoding is non-nil. --- lisp/ChangeLog | 20 +++++++++++++------- lisp/international/mule.el | 12 ++++++++++-- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2cb6d8e4021..e8cf59eade8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,15 @@ +2002-09-04 Kenichi Handa + + * international/mule.el (decode-char): Translate a character by + utf-8-translation-table-for-decode only when + utf-8-fragment-on-decoding is non-nil. + 2002-09-02 Stefan Monnier * mail/sendmail.el (mail-mode): Don't set local-abbrev-table. (mail-mode-abbrev-table): Set to text-mode-abbrev-table. -2002-09-02 Kai Gro,b_(Bjohann +2002-09-02 Kai Gro,A_(Bjohann * net/tramp.el: Version 2.0.15 released. (require 'base64): Most modern Emacsen have the base64 @@ -385,7 +391,7 @@ Always call x-focus-frame, if using x. Use set-mouse-position on all systems, if focus-follows-mouse. -2002-08-22 Kai Gro,b_(Bjohann +2002-08-22 Kai Gro,A_(Bjohann * net/tramp.el: Version 2.0.14 released. (tramp-shell-prompt-pattern): New variable. @@ -420,7 +426,7 @@ pushing mark. (f90-abbrev-start): unread-command-event is obsolete in XEmacs. -2002-08-21 Kai Gro,b_(Bjohann +2002-08-21 Kai Gro,A_(Bjohann * tramp.el: Version 2.0.13 released. (tramp-handle-write-region): Don't check to see if remote end is @@ -711,7 +717,7 @@ * wid-browse.el (widget-minor-mode): Fix doc typo. -2002-08-07 Kai Gro,b_(Bjohann +2002-08-07 Kai Gro,A_(Bjohann * net/tramp.el: Version 2.0.12 released. (tramp-find-shell, tramp-open-connection-setup-interactive-shell): @@ -789,7 +795,7 @@ * image.el (image-jpeg-p): Accept "Exif" marker. -2002-08-05 Kai Gro,b_(Bjohann +2002-08-05 Kai Gro,A_(Bjohann * net/tramp.el: Version 2.0.11 released. (tramp-perl-file-attributes): Print uid and gid as signed integers. @@ -811,7 +817,7 @@ * startup.el (fancy-splash-frame): Check selected frame last. -2002-08-04 Kai Gro,b_(Bjohann +2002-08-04 Kai Gro,A_(Bjohann * net/tramp.el: Version 2.0.10 released. (tramp-uudecode): New shell function `tramp_uudecode' to decode to @@ -824,7 +830,7 @@ (tramp-coding-commands): Add an alternative for `tramp_uudecode'. (tramp-bug): Include more variables in the report. -2002-08-04 Kai Gro,b_(Bjohann +2002-08-04 Kai Gro,A_(Bjohann * net/tramp.el: Version 2.0.9 released. (tramp-bug): Add wording about additional info to include in bug diff --git a/lisp/international/mule.el b/lisp/international/mule.el index e937d11030e..8b1dbf89762 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el @@ -308,7 +308,8 @@ See also the documentation of `make-char'." Return nil if such a character is not supported. Currently the only supported coded character set is `ucs' (ISO/IEC 10646: Universal Multi-Octet Coded Character Set), and the result is -translated through the char table `utf-8-translation-table-for-decode'. +translated through the char table `utf-8-translation-table-for-decode' +if the variable `utf-8-fragment-on-decoding' is non-nil. Optional argument RESTRICTION specifies a way to map the pair of CCS and CODE-POINT to a character. Currently not supported and just ignored." @@ -331,7 +332,9 @@ and CODE-POINT to a character. Currently not supported and just ignored." (setq code-point (- code-point #xe000)) (make-char 'mule-unicode-e000-ffff (+ (/ code-point 96) 32) (+ (% code-point 96) 32)))))) - (if (and c (aref utf-8-translation-table-for-decode c)) + (if (and c + utf-8-fragment-on-decoding + (aref utf-8-translation-table-for-decode c)) (aref utf-8-translation-table-for-decode c) c))))) @@ -843,6 +846,11 @@ following properties are recognized: In the former case, the integer value is a valid byte code. In the latter case, the integers specify the range of valid byte codes. + o composition (meaningful only when TYPE is 0 or 2) + + If the value is non-nil, the coding system preserves information of + composition. + These properties are set in PLIST, a property list. This function also sets properties `coding-category' and `alias-coding-systems' automatically. -- 2.39.2