changeset 2837:c1ec282bb160

[xemacs-hg @ 2005-06-29 09:47:33 by crestani] 2005-06-28 Marcus Crestani <crestani@xemacs.org> * 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.
author crestani
date Wed, 29 Jun 2005 09:47:35 +0000
parents c4bc66dfe66a
children 6aeaeb370bd8
files src/ChangeLog src/console-x.c src/event-Xt.c
diffstat 3 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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  <crestani@xemacs.org>
+
+	* 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  <crestani@xemacs.org>
 
 	* .cvsignore: Add dump-size, xemacs.def, xemacs.def.in.
--- 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. */
--- 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));
     }
 }