comparison src/intl.c @ 398:74fd4e045ea6 r21-2-29

Import from CVS: tag r21-2-29
author cvs
date Mon, 13 Aug 2007 11:13:30 +0200
parents 8626e4521993
children 697ef44129c6
comparison
equal deleted inserted replaced
397:f4aeb21a5bad 398:74fd4e045ea6
43 Atom wc_atom; 43 Atom wc_atom;
44 44
45 /* init_input -- Set things up for i18n level 4 input. 45 /* init_input -- Set things up for i18n level 4 input.
46 */ 46 */
47 void 47 void
48 init_input (CONST char *res_name, CONST char *res_class, Display *display) 48 init_input (const char *res_name, const char *res_class, Display *display)
49 { 49 {
50 XIMStyles *styles; 50 XIMStyles *styles;
51 unsigned short i; 51 unsigned short i;
52 52
53 input_method = 0; 53 input_method = 0;
163 } 163 }
164 } 164 }
165 #endif /* I18N4 */ 165 #endif /* I18N4 */
166 166
167 167
168 Lisp_Object Qdomain;
169 Lisp_Object Qdefer_gettext; 168 Lisp_Object Qdefer_gettext;
170 169
171 DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /* 170 DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /*
172 If OBJ is of the form (defer-gettext "string"), return the string. 171 If OBJ is of the form (defer-gettext "string"), return the string.
173 The purpose of the defer-gettext symbol is to identify strings which 172 The purpose of the defer-gettext symbol is to identify strings which
272 */ 271 */
273 (domain_name)) 272 (domain_name))
274 { 273 {
275 CHECK_STRING (domain_name); 274 CHECK_STRING (domain_name);
276 if (load_in_progress) 275 if (load_in_progress)
277 { 276 return (domain_name);
278 #ifdef I18N3
279 Vfile_domain = Fpurecopy (domain_name);
280 return Vfile_domain;
281 #else
282 return (domain_name);
283 #endif
284 }
285 else 277 else
286 return Qnil; 278 return Qnil;
287 } 279 }
288 280
289 281
305 } 297 }
306 298
307 void 299 void
308 syms_of_intl (void) 300 syms_of_intl (void)
309 { 301 {
310 defsymbol (&Qdomain, "domain");
311
312 /* defer-gettext is defined as a symbol because when it is used in menu 302 /* defer-gettext is defined as a symbol because when it is used in menu
313 specification strings, it is not evaluated as a function by 303 specification strings, it is not evaluated as a function by
314 menu_item_descriptor_to_widget_value(). */ 304 menu_item_descriptor_to_widget_value(). */
315 defsymbol (&Qdefer_gettext, "defer-gettext"); 305 defsymbol (&Qdefer_gettext, "defer-gettext");
316 306