1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-26 07:00:35 -08:00

(MAYBE_UNIFY_CHAR): Adjusted for the change of

Vchar_unify_table.  The default value of the table is now nil.
This commit is contained in:
Kenichi Handa 2002-06-12 00:12:53 +00:00
parent d8887a31dd
commit fc9d9d2a1f

View file

@ -448,23 +448,27 @@ Boston, MA 02111-1307, USA. */
} while (0)
#define MAYBE_UNIFY_CHAR(c) \
if (CHAR_TABLE_P (Vchar_unify_table)) \
{ \
Lisp_Object val; \
int unified; \
\
val = CHAR_TABLE_REF (Vchar_unify_table, c); \
if (SYMBOLP (val)) \
{ \
Funify_charset (val, Qnil); \
val = CHAR_TABLE_REF (Vchar_unify_table, c); \
} \
if ((unified = XINT (val)) >= 0) \
c = unified; \
} \
#define MAYBE_UNIFY_CHAR(c) \
if (CHAR_TABLE_P (Vchar_unify_table)) \
{ \
Lisp_Object val; \
int unified; \
\
val = CHAR_TABLE_REF (Vchar_unify_table, c); \
if (! NILP (val)) \
{ \
if (SYMBOLP (val)) \
{ \
Funify_charset (val, Qnil); \
val = CHAR_TABLE_REF (Vchar_unify_table, c); \
} \
if ((unified = XINT (val)) >= 0) \
c = unified; \
} \
} \
else
/* Return the width of ASCII character C. The width is measured by
how many columns occupied on the screen when displayed in the
current buffer. */