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

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/08/29 07:56:41

Index: keyboard.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/keyboard.c,v
retrieving revision 1.970
retrieving revision 1.971
diff -u -b -r1.970 -r1.971
--- keyboard.c  23 Aug 2008 16:52:37 -0000      1.970
+++ keyboard.c  29 Aug 2008 07:56:40 -0000      1.971
@@ -1994,13 +1994,9 @@
       /* FIXME: check `intangible'.  */
       if (check_composition
          && PT > BEGV && PT < ZV
-         && get_property_and_range (PT, Qcomposition, &val, &beg, &end, Qnil)
-         && COMPOSITION_VALID_P (beg, end, val)
-         && beg < PT /* && end > PT   <- It's always the case.  */
-         && (last_pt <= beg || last_pt >= end))
+         && (beg = composition_adjust_point (last_pt)) != PT)
        {
-         xassert (end > PT);
-         SET_PT (PT < last_pt ? beg : end);
+         SET_PT (beg);
          check_display = check_invisible = 1;
        }
       check_composition = 0;