Mercurial > hg > xemacs-beta

diff src/input-method-xlib.c @ 272:c5d627a313b1 r21-0b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b34
author cvs
date Mon, 13 Aug 2007 10:28:48 +0200
parents 966663fcf606
children 7df0dd720c89
line wrap: on
line diff
--- a/src/input-method-xlib.c	Mon Aug 13 10:27:41 2007 +0200
+++ b/src/input-method-xlib.c	Mon Aug 13 10:28:48 2007 +0200
@@ -245,8 +245,8 @@
 
   if (style & XIMPreeditPosition)
     { /* Init spot to invalid values */
-      XPoint *spot = &(FRAME_X_XIC_SPOT (f));
-      spot->x = spot->y = -1;
+      XPoint *frame_spot = &(FRAME_X_XIC_SPOT (f));
+      frame_spot->x = frame_spot->y = -1;
     }
 
   XIM_SetGeometry (f);
@@ -475,8 +475,8 @@
   };
 #undef STYLE_INFO
 
-  CONST char *s   = (char *) fromVal->addr;
-  CONST char *end = s + fromVal->size;
+  char *s   = (char *) fromVal->addr;
+  char *end = s + fromVal->size;
   XIMStyles * CONST p = (XIMStyles *) toVal->addr;
   CONST char * CONST delimiter = " \t\n\r:;," ;
   CONST int  max_styles = XtNumber(emacs_XIMStyleInfo);