Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
58ccf243
Commit
58ccf243
authored
Apr 24, 2010
by
Juanma Barranquero
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove conflict markers.
parent
51d28d3e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
src/ChangeLog
src/ChangeLog
+1
-6
No files found.
src/ChangeLog
View file @
58ccf243
...
...
@@ -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)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment