Mercurial > emacs
diff src/xdisp.c @ 90099:fa9654493afb
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-10
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-59
- miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-68
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 02 Feb 2005 01:54:00 +0000 |
parents | f8a7a9ba3d08 615d37ab8a5d |
children | 72cf6261961e |
line wrap: on
line diff
--- a/src/xdisp.c Mon Jan 31 01:41:13 2005 +0000 +++ b/src/xdisp.c Wed Feb 02 01:54:00 2005 +0000 @@ -4799,6 +4799,7 @@ int beg, end; Lisp_Object val, overlay; + it2.sp = 0; if (handle_display_prop (&it2) == HANDLED_RETURN && !NILP (val = get_char_property_and_overlay (make_number (pos), Qdisplay, Qnil, &overlay))