--- a/src/intl.c	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/intl.c	Mon Aug 13 11:20:41 2007 +0200
@@ -45,7 +45,7 @@
 /* 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;
@@ -165,6 +165,7 @@
 #endif /* I18N4 */
 
 
+Lisp_Object Qdomain;
 Lisp_Object Qdefer_gettext;
 
 DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /*
@@ -273,7 +274,14 @@
 {
   CHECK_STRING (domain_name);
   if (load_in_progress)
-    return (domain_name);
+    {
+#ifdef I18N3
+      Vfile_domain = Fpurecopy (domain_name);
+      return Vfile_domain;
+#else
+      return (domain_name);
+#endif
+    }
   else
     return Qnil;
 }
@@ -299,6 +307,8 @@
 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(). */