[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/keyboard.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/keyboard.c |
Date: |
Mon, 16 May 2005 17:25:32 -0400 |
Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.823 emacs/src/keyboard.c:1.824
*** emacs/src/keyboard.c:1.823 Fri May 13 08:44:49 2005
--- emacs/src/keyboard.c Mon May 16 21:25:32 2005
***************
*** 1947,1956 ****
? get_property_and_range (PT, Qdisplay, &val, &beg, &end, Qnil)
: (beg = OVERLAY_POSITION (OVERLAY_START (overlay)),
end = OVERLAY_POSITION (OVERLAY_END (overlay))))
! && beg < PT) /* && end > PT <- It's always the case. */
{
xassert (end > PT);
! SET_PT (PT < last_pt ? beg : end);
check_composition = check_invisible = 1;
}
check_display = 0;
--- 1947,1959 ----
? get_property_and_range (PT, Qdisplay, &val, &beg, &end, Qnil)
: (beg = OVERLAY_POSITION (OVERLAY_START (overlay)),
end = OVERLAY_POSITION (OVERLAY_END (overlay))))
! && (beg < PT /* && end > PT <- It's always the case. */
! || (beg <= PT && STRINGP (val) && SCHARS (val) == 0)))
{
xassert (end > PT);
! SET_PT (PT < last_pt
! ? (STRINGP (val) && SCHARS (val) == 0 ? beg - 1 : beg)
! : end);
check_composition = check_invisible = 1;
}
check_display = 0;