diff options
| author | Eli Zaretskii | 2010-05-14 12:02:50 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2010-05-14 12:02:50 +0300 |
| commit | b4b6e17e0077ab70fcc967a432cd12e9d24b8720 (patch) | |
| tree | 9421caef942f671c9e5f100d86e79b3eca09d32e | |
| parent | d567e92ffa261e0cc01b7644d2c3a7e2241a579d (diff) | |
| download | emacs-b4b6e17e0077ab70fcc967a432cd12e9d24b8720.tar.gz emacs-b4b6e17e0077ab70fcc967a432cd12e9d24b8720.zip | |
Fix spelling and remove merge marks due to 2010-05-14T04:14:23Z!handa@etlken.
| -rw-r--r-- | src/ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5d47f437d4a..962f439de44 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -6,7 +6,7 @@ | |||
| 6 | ENDPOS < CHARPOS. | 6 | ENDPOS < CHARPOS. |
| 7 | (composition_reseat_it): Handle the case that ENDPOS < CHARPOS. | 7 | (composition_reseat_it): Handle the case that ENDPOS < CHARPOS. |
| 8 | Set CMP_IT->reversed_p. | 8 | Set CMP_IT->reversed_p. |
| 9 | (composition_update_it): Pay attention ot CMP_IT->reversed_p. | 9 | (composition_update_it): Pay attention to CMP_IT->reversed_p. |
| 10 | 10 | ||
| 11 | * xdisp.c (set_iterator_to_next): Call | 11 | * xdisp.c (set_iterator_to_next): Call |
| 12 | composition_compute_stop_pos with negative ENDPOS if we are | 12 | composition_compute_stop_pos with negative ENDPOS if we are |
| @@ -102,7 +102,6 @@ | |||
| 102 | * xdisp.c (init_iterator): Don't turn on bidi reordering in | 102 | * xdisp.c (init_iterator): Don't turn on bidi reordering in |
| 103 | unibyte buffers. See | 103 | unibyte buffers. See |
| 104 | http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html. | 104 | http://lists.gnu.org/archive/html/emacs-devel/2010-05/msg00263.html. |
| 105 | >>>>>>> MERGE-SOURCE | ||
| 106 | 105 | ||
| 107 | 2010-05-10 Glenn Morris <rgm@gnu.org> | 106 | 2010-05-10 Glenn Morris <rgm@gnu.org> |
| 108 | 107 | ||