Mercurial > emacs
diff src/composite.c @ 106185:f2cea199b0c4
* character.h (STRING_CHAR, STRING_CHAR_AND_LENGTH): Remove
ignored second argument. All callers changed.
* regex.c (STRING_CHAR, STRING_CHAR_AND_LENGTH, RE_STRING_CHAR)
(RE_STRING_CHAR_AND_LENGTH): Likewise.
* xdisp.c (string_char_and_length): Likewise.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sat, 21 Nov 2009 11:52:23 +0000 |
| parents | 21bdda3ded62 |
| children | 484702d8c582 |
line wrap: on
line diff
--- a/src/composite.c Sat Nov 21 10:32:20 2009 +0000 +++ b/src/composite.c Sat Nov 21 11:52:23 2009 +0000 @@ -1321,7 +1321,7 @@ retry: check_val = Qnil; /* At first, check if POS is composable. */ - c = STRING_CHAR (cur.p, 0); + c = STRING_CHAR (cur.p); if (! CHAR_COMPOSABLE_P (c)) { if (limit < 0) @@ -1347,7 +1347,7 @@ fore_check_limit = cur.pos; break; } - c = STRING_CHAR (cur.p, 0); + c = STRING_CHAR (cur.p); if (! CHAR_COMPOSABLE_P (c)) break; val = CHAR_TABLE_REF (Vcomposition_function_table, c); @@ -1368,7 +1368,7 @@ if (get_property_and_range (cur.pos, Qcomposition, &val, &b, &e, Qnil) && COMPOSITION_VALID_P (b, e, val)) break; - c = STRING_CHAR (cur.p, 0); + c = STRING_CHAR (cur.p); if (! CHAR_COMPOSABLE_P (c)) break; val = CHAR_TABLE_REF (Vcomposition_function_table, c); @@ -1391,7 +1391,7 @@ if (NILP (check_val)) { - c = STRING_CHAR (cur.p, 0); + c = STRING_CHAR (cur.p); check_val = CHAR_TABLE_REF (Vcomposition_function_table, c); } for (; CONSP (check_val); check_val = XCDR (check_val))