diff options
| author | Romain Francoise | 2008-09-17 19:16:09 +0000 |
|---|---|---|
| committer | Romain Francoise | 2008-09-17 19:16:09 +0000 |
| commit | 939c679e0a597d7fcb0704e37cfa59c4dbb5d913 (patch) | |
| tree | 2af214029c356a512ab403afc9ecce41459823e1 /src | |
| parent | b2a9ce7e482b11aeab161d4b810b7feaa4fe442a (diff) | |
| download | emacs-939c679e0a597d7fcb0704e37cfa59c4dbb5d913.tar.gz emacs-939c679e0a597d7fcb0704e37cfa59c4dbb5d913.zip | |
(composition_adjust_point): Fix int/EMACS_INT mixup.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/composite.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4b4e4cfe089..1e9f491a655 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2008-09-17 Romain Francoise <romain@orebokech.com> | ||
| 2 | |||
| 3 | * composite.c (composition_adjust_point): Fix int/EMACS_INT mixup. | ||
| 4 | |||
| 1 | 2008-09-17 Kenichi Handa <handa@m17n.org> | 5 | 2008-09-17 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | * ftfont.c (ftfont_shape_by_flt): Downcase family name. | 7 | * ftfont.c (ftfont_shape_by_flt): Downcase family name. |
diff --git a/src/composite.c b/src/composite.c index 576e0c8a402..95f700c7116 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -1429,7 +1429,7 @@ composition_adjust_point (last_pt) | |||
| 1429 | return PT; | 1429 | return PT; |
| 1430 | 1430 | ||
| 1431 | /* Next check the automatic composition. */ | 1431 | /* Next check the automatic composition. */ |
| 1432 | if (! find_automatic_composition (PT, -1, &beg, &end, &val, Qnil) | 1432 | if (! find_automatic_composition (PT, (EMACS_INT) -1, &beg, &end, &val, Qnil) |
| 1433 | || beg == PT) | 1433 | || beg == PT) |
| 1434 | return PT; | 1434 | return PT; |
| 1435 | for (i = 0; i < LGSTRING_GLYPH_LEN (val); i++) | 1435 | for (i = 0; i < LGSTRING_GLYPH_LEN (val); i++) |