# HG changeset patch # User crestani # Date 1120038455 0 # Node ID c1ec282bb160f0c67d238f35a349268755a0c1f5 # Parent c4bc66dfe66a95b0f254a29627a670fd44f3420d [xemacs-hg @ 2005-06-29 09:47:33 by crestani] 2005-06-28 Marcus Crestani * console-x.c (x_perhaps_init_unseen_key_defaults): Use build_intstring to avoid type error. * event-Xt.c (x_keysym_to_emacs_keysym): Add cast to avoid type error. diff -r c4bc66dfe66a -r c1ec282bb160 src/ChangeLog --- a/src/ChangeLog Tue Jun 28 21:51:26 2005 +0000 +++ b/src/ChangeLog Wed Jun 29 09:47:35 2005 +0000 @@ -1,3 +1,10 @@ +2005-06-28 Marcus Crestani + + * console-x.c (x_perhaps_init_unseen_key_defaults): Use + build_intstring to avoid type error. + * event-Xt.c (x_keysym_to_emacs_keysym): Add cast to avoid type + error. + 2005-06-28 Marcus Crestani * .cvsignore: Add dump-size, xemacs.def, xemacs.def.in. diff -r c4bc66dfe66a -r c1ec282bb160 src/console-x.c --- a/src/console-x.c Tue Jun 28 21:51:26 2005 +0000 +++ b/src/console-x.c Wed Jun 29 09:47:35 2005 +0000 @@ -333,7 +333,7 @@ CHECK_CHAR(key); buf[set_itext_ichar(buf, XCHAR(key))] = '\0'; - key_name = build_string(buf); + key_name = build_intstring (buf); /* We need to do the lookup and compare later, because we can't check the Qcharacter_of_keysym property belonging to an actual character. */ diff -r c4bc66dfe66a -r c1ec282bb160 src/event-Xt.c --- a/src/event-Xt.c Tue Jun 28 21:51:26 2005 +0000 +++ b/src/event-Xt.c Wed Jun 29 09:47:35 2005 +0000 @@ -826,7 +826,7 @@ INC_IBYTEPTR(iname); } } - return KEYSYM (eidata(einame)); + return KEYSYM ((const CIbyte *) eidata (einame)); } }