Mercurial > hg > xemacs-beta

diff src/input-method-xlib.c @ 380:8626e4521993 r21-2-5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-5
author cvs
date Mon, 13 Aug 2007 11:07:10 +0200
parents d883f39b8495
children 74fd4e045ea6
line wrap: on
line diff
--- a/src/input-method-xlib.c	Mon Aug 13 11:06:08 2007 +0200
+++ b/src/input-method-xlib.c	Mon Aug 13 11:07:10 2007 +0200
@@ -187,10 +187,10 @@
   static XtResource resources[] =
   {
     /*  name              class          represent'n   field    default value */
-    res(XtNximStyles,     XtCXimStyles,  XtRXimStyles, styles,  DefaultXIMStyles),
-    res(XtNfontSet,       XtCFontSet,    XtRFontSet,   fontset, XtDefaultFontSet),
-    res(XtNximForeground, XtCForeground, XtRPixel,     fg,      XtDefaultForeground),
-    res(XtNximBackground, XtCBackground, XtRPixel,     bg,      XtDefaultBackground)
+    res(XtNximStyles,     XtCXimStyles,  XtRXimStyles, styles,  (XtPointer) DefaultXIMStyles),
+    res(XtNfontSet,       XtCFontSet,    XtRFontSet,   fontset, (XtPointer) XtDefaultFontSet),
+    res(XtNximForeground, XtCForeground, XtRPixel,     fg,      (XtPointer) XtDefaultForeground),
+    res(XtNximBackground, XtCBackground, XtRPixel,     bg,      (XtPointer) XtDefaultBackground)
   };
 
   assert (win != 0 && w != NULL && d != NULL);
@@ -385,14 +385,14 @@
   int i;
   XClientMessageEvent new_event;
 
-try_again:
+retry:
   len = XwcLookupString (ic, x_key_event, composed_input_buf.data,
 			 composed_input_buf.size, &keysym, &status);
   switch (status)
     {
     case XBufferOverflow:
       /* GROW_WC_STRING (&composed_input_buf, 32); mrb */
-      goto try_again;
+      goto retry;
     case XLookupChars:
       break;
     default: