X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fintl.c;h=befca9bdd868e2757f303c1e66ea552d58899823;hb=3da83961156331088480cbd748f65828448c620a;hp=7c06c742607be053a10f031d658f251a0e23e091;hpb=ea1ea793fe6e244ef5555ed983423a204101af13;p=chise%2Fxemacs-chise.git-

diff --git a/src/intl.c b/src/intl.c
index 7c06c74..befca9b 100644
--- a/src/intl.c
+++ b/src/intl.c
@@ -45,7 +45,7 @@ Atom wc_atom;
 /* init_input -- Set things up for i18n level 4 input.
 */
 void
-init_input (CONST char *res_name, CONST char *res_class, Display *display)
+init_input (const char *res_name, const char *res_class, Display *display)
 {
   XIMStyles *styles;
   unsigned short i;
@@ -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, /*