Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b4b6e17e
Commit
b4b6e17e
authored
May 14, 2010
by
Eli Zaretskii
Browse files
Fix spelling and remove merge marks due to 2010-05-14T04:14:23Z!handa@etlken.
parent
d567e92f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
src/ChangeLog
src/ChangeLog
+1
-2
No files found.
src/ChangeLog
View file @
b4b6e17e
...
...
@@ -6,7 +6,7 @@
ENDPOS < CHARPOS.
(composition_reseat_it): Handle the case that ENDPOS < CHARPOS.
Set CMP_IT->reversed_p.
(composition_update_it): Pay attention
o
t CMP_IT->reversed_p.
(composition_update_it): Pay attention t
o
CMP_IT->reversed_p.
* xdisp.c (set_iterator_to_next): Call
composition_compute_stop_pos with negative ENDPOS if we are
...
...
@@ -102,7 +102,6 @@
* xdisp.c (init_iterator): Don't turn on bidi reordering in
unibyte buffers. See
http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html.
>>>>>>> MERGE-SOURCE
2010-05-10 Glenn Morris <rgm@gnu.org>
...
...
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