diff options
| author | Juanma Barranquero | 2010-04-24 14:33:31 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2010-04-24 14:33:31 +0200 |
| commit | 58ccf24384c14146d63cb6060c17f1a0e2131b6c (patch) | |
| tree | a813f9247329597ef6c41825a82011f4d374ae72 /src | |
| parent | 51d28d3ec44e006746d1107f1819824d803c6232 (diff) | |
| download | emacs-58ccf24384c14146d63cb6060c17f1a0e2131b6c.tar.gz emacs-58ccf24384c14146d63cb6060c17f1a0e2131b6c.zip | |
Remove conflict markers.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 7979e809a9d..5ee4f8c8de1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -58,12 +58,7 @@ | |||
| 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) |