Mercurial > hg > xemacs-beta
comparison src/intl.c @ 412:697ef44129c6 r21-2-14
Import from CVS: tag r21-2-14
author | cvs |
---|---|
date | Mon, 13 Aug 2007 11:20:41 +0200 |
parents | 74fd4e045ea6 |
children | 11054d720c21 |
comparison
equal
deleted
inserted
replaced
411:12e008d41344 | 412:697ef44129c6 |
---|---|
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; | |
168 Lisp_Object Qdefer_gettext; | 169 Lisp_Object Qdefer_gettext; |
169 | 170 |
170 DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /* | 171 DEFUN ("ignore-defer-gettext", Fignore_defer_gettext, 1, 1, 0, /* |
171 If OBJ is of the form (defer-gettext "string"), return the string. | 172 If OBJ is of the form (defer-gettext "string"), return the string. |
172 The purpose of the defer-gettext symbol is to identify strings which | 173 The purpose of the defer-gettext symbol is to identify strings which |
271 */ | 272 */ |
272 (domain_name)) | 273 (domain_name)) |
273 { | 274 { |
274 CHECK_STRING (domain_name); | 275 CHECK_STRING (domain_name); |
275 if (load_in_progress) | 276 if (load_in_progress) |
276 return (domain_name); | 277 { |
278 #ifdef I18N3 | |
279 Vfile_domain = Fpurecopy (domain_name); | |
280 return Vfile_domain; | |
281 #else | |
282 return (domain_name); | |
283 #endif | |
284 } | |
277 else | 285 else |
278 return Qnil; | 286 return Qnil; |
279 } | 287 } |
280 | 288 |
281 | 289 |
297 } | 305 } |
298 | 306 |
299 void | 307 void |
300 syms_of_intl (void) | 308 syms_of_intl (void) |
301 { | 309 { |
310 defsymbol (&Qdomain, "domain"); | |
311 | |
302 /* defer-gettext is defined as a symbol because when it is used in menu | 312 /* defer-gettext is defined as a symbol because when it is used in menu |
303 specification strings, it is not evaluated as a function by | 313 specification strings, it is not evaluated as a function by |
304 menu_item_descriptor_to_widget_value(). */ | 314 menu_item_descriptor_to_widget_value(). */ |
305 defsymbol (&Qdefer_gettext, "defer-gettext"); | 315 defsymbol (&Qdefer_gettext, "defer-gettext"); |
306 | 316 |