[Emacs-diffs] Changes to emacs/src/composite.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/09/07 01:11:47

Index: composite.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/composite.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- composite.c 5 Sep 2008 00:46:57 -0000       1.54
+++ composite.c 7 Sep 2008 01:11:46 -0000       1.55
@@ -1189,11 +1189,17 @@
 /* Update the members of POSTION to the next character boundary.  */
 #define FORWARD_CHAR(POSITION, STOP)                                   \
   do {                                                                 \
+    (POSITION).pos++;                                                  \
     if ((POSITION).pos == (STOP))                                      \
+      {                                                                        
\
       (POSITION).p = GAP_END_ADDR;                                     \
-    (POSITION).pos++;                                                  \
-    (POSITION).pos_byte += BYTES_BY_CHAR_HEAD (*((POSITION).p));       \
+       (POSITION).pos_byte = GPT_BYTE;                                 \
+      }                                                                        
\
+    else                                                               \
+      {                                                                        
\
     (POSITION).p += BYTES_BY_CHAR_HEAD (*((POSITION).p));              \
+       (POSITION).pos_byte += BYTES_BY_CHAR_HEAD (*((POSITION).p));    \
+      }                                                                        
\
   } while (0)
 
 /* Update the members of POSTION to the previous character boundary.  */