Mercurial > emacs

comparison src/ChangeLog @ 108104:17710e3a17df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove conflict markers.
author Juanma Barranquero <lekktu@gmail.com>
date Sat, 24 Apr 2010 14:33:31 +0200
parents 01ca94871a56
children 473b75d8b120
comparison
equal deleted inserted replaced
108103:01ca94871a56 108104:17710e3a17df
56 56
57 * gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style. 57 * gtkutil.c: Include xsettings.h for Ftool_bar_get_system_style.
58 58
59 2010-04-23 Eli Zaretskii <eliz@gnu.org> 59 2010-04-23 Eli Zaretskii <eliz@gnu.org>
60 60
61 Support `display' text properties and overlay strings in bidi 61 Support `display' text properties and overlay strings in bidi buffers.
62 buffers.
63 =======
64 2010-04-23 Eli Zaretskii <eliz@gnu.org>
65
66 >>>>>>> MERGE-SOURCE
67 * xdisp.c (pop_it): When the stack is popped after displaying 62 * xdisp.c (pop_it): When the stack is popped after displaying
68 from a string, bidi-iterate to exit from the text portion covered 63 from a string, bidi-iterate to exit from the text portion covered
69 by the `display' property or overlay. (Bug#5988, bug#5920) 64 by the `display' property or overlay. (Bug#5988, bug#5920)
70 65
71 2010-04-23 Dan Nicolaescu <dann@ics.uci.edu> 66 2010-04-23 Dan Nicolaescu <dann@ics.uci.edu>