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

[Kim F. Storm]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kim F. Storm <kfstorm>  06/06/27 11:21:32

Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1107
retrieving revision 1.1108
diff -u -b -r1.1107 -r1.1108
--- xdisp.c     23 Jun 2006 11:50:36 -0000      1.1107
+++ xdisp.c     27 Jun 2006 11:21:31 -0000      1.1108
@@ -4488,7 +4488,9 @@
              return HANDLED_RECOMPUTE_PROPS;
            }
 
+         it->stop_charpos = end;
          push_it (it);
+
          it->method = GET_FROM_COMPOSITION;
          it->cmp_id = id;
          it->cmp_len = COMPOSITION_LENGTH (prop);
@@ -4498,7 +4500,6 @@
          it->len = (STRINGP (it->string)
                     ? string_char_to_byte (it->string, end)
                     : CHAR_TO_BYTE (end)) - pos_byte;
-         it->stop_charpos = end;
          handled = HANDLED_RETURN;
        }
     }