diff options
| author | Eli Zaretskii | 2011-08-23 17:45:14 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2011-08-23 17:45:14 +0300 |
| commit | bca633fb296b17c0e86d589c50fb3414b361e0b3 (patch) | |
| tree | 1b1e93f6017f7614f6aa950fa78ced1249a99b99 /src | |
| parent | 4a5885a74a3310ed4f4ba86eee3c406019b2c334 (diff) | |
| download | emacs-bca633fb296b17c0e86d589c50fb3414b361e0b3.tar.gz emacs-bca633fb296b17c0e86d589c50fb3414b361e0b3.zip | |
Followup for character properties in 2011-08-23T11:48:07Z!handa@m17n.org.
src/bidi.c (bidi_get_type): Abort if we get zero as the bidi type of
a character.
admin/unidata/unidata-gen.el (unidata-prop-alist): Update the default
values of bidi-class according to DerivedBidiClass.txt from the
latest UCD.
lisp/international/uni-bidi.el: Regenerated.
doc/lispref/nonascii.texi (Character Properties): Document the values for
unassigned codepoints.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/bidi.c | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e7d426f23fb..c629598fcf7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-08-23 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * bidi.c (bidi_get_type): Abort if we get zero as the bidi type of | ||
| 4 | a character. | ||
| 5 | |||
| 1 | 2011-08-23 Chong Yidong <cyd@stupidchicken.com> | 6 | 2011-08-23 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 7 | ||
| 3 | * nsfont.m (ns_otf_to_script): Fix typo. | 8 | * nsfont.m (ns_otf_to_script): Fix typo. |
diff --git a/src/bidi.c b/src/bidi.c index 7517eca5aed..00aa31bf48d 100644 --- a/src/bidi.c +++ b/src/bidi.c | |||
| @@ -108,8 +108,12 @@ bidi_get_type (int ch, bidi_dir_t override) | |||
| 108 | abort (); | 108 | abort (); |
| 109 | 109 | ||
| 110 | default_type = (bidi_type_t) XINT (CHAR_TABLE_REF (bidi_type_table, ch)); | 110 | default_type = (bidi_type_t) XINT (CHAR_TABLE_REF (bidi_type_table, ch)); |
| 111 | if (default_type == 0) | 111 | /* Every valid character code, even those that are unassigned by the |
| 112 | default_type = STRONG_L; | 112 | UCD, have some bidi-class property, according to |
| 113 | DerivedBidiClass.txt file. Therefore, if we ever get UNKNOWN_BT | ||
| 114 | (= zero) code from CHAR_TABLE_REF, that's a bug. */ | ||
| 115 | if (default_type == UNKNOWN_BT) | ||
| 116 | abort (); | ||
| 113 | 117 | ||
| 114 | if (override == NEUTRAL_DIR) | 118 | if (override == NEUTRAL_DIR) |
| 115 | return default_type; | 119 | return default_type; |