Mercurial > hg > xemacs-beta
comparison src/gui-x.c @ 14:9ee227acff29 r19-15b90
Import from CVS: tag r19-15b90
author | cvs |
---|---|
date | Mon, 13 Aug 2007 08:48:42 +0200 |
parents | ac2d302a0011 |
children | 0293115a14e9 |
comparison
equal
deleted
inserted
replaced
13:13c6d0aaafe5 | 14:9ee227acff29 |
---|---|
431 return 0; | 431 return 0; |
432 } | 432 } |
433 #endif | 433 #endif |
434 | 434 |
435 CHECK_STRING (name); | 435 CHECK_STRING (name); |
436 wv->name = (char *) string_data (XSTRING (name)); | 436 wv->name = (char *) XSTRING_DATA (name); |
437 | 437 |
438 if (!NILP (suffix)) | 438 if (!NILP (suffix)) |
439 { | 439 { |
440 CONST char *const_bogosity; | 440 CONST char *const_bogosity; |
441 CHECK_STRING (suffix); | 441 CHECK_STRING (suffix); |
457 wv->key = 0; | 457 wv->key = 0; |
458 else if (!NILP (keys)) /* Use this string to generate key bindings */ | 458 else if (!NILP (keys)) /* Use this string to generate key bindings */ |
459 { | 459 { |
460 CHECK_STRING (keys); | 460 CHECK_STRING (keys); |
461 keys = Fsubstitute_command_keys (keys); | 461 keys = Fsubstitute_command_keys (keys); |
462 if (string_length (XSTRING (keys)) > 0) | 462 if (XSTRING_LENGTH (keys) > 0) |
463 wv->key = xstrdup ((char *) string_data (XSTRING (keys))); | 463 wv->key = xstrdup ((char *) XSTRING_DATA (keys)); |
464 else | 464 else |
465 wv->key = 0; | 465 wv->key = 0; |
466 } | 466 } |
467 else if (SYMBOLP (callback)) /* Show the binding of this command. */ | 467 else if (SYMBOLP (callback)) /* Show the binding of this command. */ |
468 { | 468 { |