(M17260): Separate U+6CBF, J90-3168 and C1-4E58.

[chise/xemacs-chise.git] / src / intl.c

diff --git a/src/intl.c b/src/intl.c
index da4ac18..7c06c74 100644 (file)
--- a/src/intl.c
+++ b/src/intl.c
@@ -123,7 +123,7 @@ Window main_window;  /* Convenient way to refer to main Era window. */
    insertion into the buffer of the whole string.  It might require some
    care, though, to avoid fragmenting memory through the allocation and
    freeing of many small chunks.  Maybe the existing system for
-   (single-byte) string allocation can be used, multipling the length by
+   (single-byte) string allocation can be used, multiplying the length by
    sizeof (wchar_t) to get the right size.
 */
 void
@@ -136,14 +136,14 @@ x_get_composed_input (XKeyPressedEvent *x_key_event, XIC context,
   int i;
   XClientMessageEvent new_event;
 
- try_again:
+ retry:
   len = XwcLookupString (context, x_key_event, composed_input_buf.data,
                         composed_input_buf.size, &keysym, &status);
   switch (status)
     {
     case XBufferOverflow:
       /* GROW_WC_STRING (&composed_input_buf, 32); mrb */
-      goto try_again;
+      goto retry;
     case XLookupChars:
       break;
     default:
@@ -165,7 +165,6 @@ x_get_composed_input (XKeyPressedEvent *x_key_event, XIC context,
 #endif /* I18N4 */
 
 
-Lisp_Object Qdomain;
 Lisp_Object Qdefer_gettext;
 
 DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /*
@@ -274,14 +273,7 @@ Bug: it has no effect on source (.el) files, only compiled (.elc) files.
 {
   CHECK_STRING (domain_name);
   if (load_in_progress)
-    {
-#ifdef I18N3
-      Vfile_domain = Fpurecopy (domain_name);
-      return Vfile_domain;
-#else
-      return (domain_name);
-#endif
-    }
+    return (domain_name);
   else
     return Qnil;
 }
@@ -307,8 +299,6 @@ init_intl_very_early (void)
 void
 syms_of_intl (void)
 {
-  defsymbol (&Qdomain, "domain");
-
   /* defer-gettext is defined as a symbol because when it is used in menu
      specification strings, it is not evaluated as a function by
      menu_item_descriptor_to_widget_value(). */