Commit 58ccf243 authored by Juanma Barranquero's avatar Juanma Barranquero

Remove conflict markers.

parent 51d28d3e
......@@ -58,12 +58,7 @@
2010-04-23 Eli Zaretskii <eliz@gnu.org>
Support `display' text properties and overlay strings in bidi
buffers.
=======
2010-04-23 Eli Zaretskii <eliz@gnu.org>
>>>>>>> MERGE-SOURCE
Support `display' text properties and overlay strings in bidi buffers.
* xdisp.c (pop_it): When the stack is popped after displaying
from a string, bidi-iterate to exit from the text portion covered
by the `display' property or overlay. (Bug#5988, bug#5920)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment