[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/23 11:50:38

Index: xdisp.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xdisp.c,v
retrieving revision 1.1106
retrieving revision 1.1107
diff -u -b -r1.1106 -r1.1107
--- xdisp.c     21 Jun 2006 11:49:24 -0000      1.1106
+++ xdisp.c     23 Jun 2006 11:50:36 -0000      1.1107
@@ -4487,6 +4487,8 @@
                }
              return HANDLED_RECOMPUTE_PROPS;
            }
+
+         push_it (it);
          it->method = GET_FROM_COMPOSITION;
          it->cmp_id = id;
          it->cmp_len = COMPOSITION_LENGTH (prop);
@@ -5791,19 +5793,19 @@
 
     case GET_FROM_COMPOSITION:
       xassert (it->cmp_id >= 0 && it->cmp_id < n_compositions);
-      if (STRINGP (it->string))
+      xassert (it->sp > 0);
+      pop_it (it);
+      if (it->method == GET_FROM_STRING)
        {
          IT_STRING_BYTEPOS (*it) += it->len;
          IT_STRING_CHARPOS (*it) += it->cmp_len;
-         it->method = GET_FROM_STRING;
          it->object = it->string;
          goto consider_string_end;
        }
-      else
+      else if (it->method == GET_FROM_BUFFER)
        {
          IT_BYTEPOS (*it) += it->len;
          IT_CHARPOS (*it) += it->cmp_len;
-         it->method = GET_FROM_BUFFER;
          it->object = it->w->buffer;
        }
       break;