X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fintl.c;h=121946c10d2e8dd682da1396289155e786129403;hb=a6f3dc9882f7eec7fbbe4700581bace298ab3335;hp=a8a14d87510d625f1a11222efdd1cc2041a0e2dd;hpb=3e447015251ce6dcde843cbed10d9033d5538622;p=chise%2Fxemacs-chise.git.1 diff --git a/src/intl.c b/src/intl.c index a8a14d8..121946c 100644 --- a/src/intl.c +++ b/src/intl.c @@ -147,7 +147,7 @@ x_get_composed_input (XKeyPressedEvent *x_key_event, XIC context, case XLookupChars: break; default: - abort (); + ABORT (); } new_event.type = ClientMessage; @@ -168,16 +168,18 @@ x_get_composed_input (XKeyPressedEvent *x_key_event, XIC context, Lisp_Object Qdefer_gettext; DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /* -If OBJ is of the form (defer-gettext "string"), return the string. +If OBJECT is of the form (defer-gettext "string"), return the string. The purpose of the defer-gettext symbol is to identify strings which are translated when they are referenced instead of when they are defined. */ - (obj)) + (object)) { - if (CONSP (obj) && SYMBOLP (Fcar (obj)) && EQ (Fcar (obj), Qdefer_gettext)) - return Fcar (Fcdr (obj)); + if (CONSP (object) + && SYMBOLP (Fcar (object)) + && EQ (Fcar (object), Qdefer_gettext)) + return Fcar (Fcdr (object)); else - return obj; + return object; } DEFUN ("gettext", Fgettext, 1, 1, 0, /*