diff options
| author | Kenichi Handa | 2014-01-19 22:26:21 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2014-01-19 22:26:21 +0900 |
| commit | d25f735b87451585fe4a4f66098619bc0c4d32fd (patch) | |
| tree | d1a64d610ecc413a63574a524f8c809934c94dfe /src | |
| parent | 4ff6d92ddd7e36f9dac5b418ddea1ce0524b54c4 (diff) | |
| download | emacs-d25f735b87451585fe4a4f66098619bc0c4d32fd.tar.gz emacs-d25f735b87451585fe4a4f66098619bc0c4d32fd.zip | |
composite.c (composition_update_it): Fix previous change.
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 82a5d68b923..2ef0336388a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-01-19 K. Handa <handa@gnu.org> | ||
| 2 | |||
| 3 | * composite.c (composition_update_it): Fix previous change. | ||
| 4 | |||
| 1 | 2014-01-18 Eli Zaretskii <eliz@gnu.org> | 5 | 2014-01-18 Eli Zaretskii <eliz@gnu.org> |
| 2 | 6 | ||
| 3 | Fix file name handling on MS-Windows 9X. | 7 | Fix file name handling on MS-Windows 9X. |
diff --git a/src/composite.c b/src/composite.c index 40cef814c1d..04cfe5efee0 100644 --- a/src/composite.c +++ b/src/composite.c | |||
| @@ -1412,7 +1412,7 @@ composition_update_it (struct composition_it *cmp_it, ptrdiff_t charpos, ptrdiff | |||
| 1412 | cmp_it->width = 0; | 1412 | cmp_it->width = 0; |
| 1413 | for (i = cmp_it->nchars - 1; i >= 0; i--) | 1413 | for (i = cmp_it->nchars - 1; i >= 0; i--) |
| 1414 | { | 1414 | { |
| 1415 | c = XINT (LGSTRING_CHAR (gstring, cmp_it->from + i)); | 1415 | c = XINT (LGSTRING_CHAR (gstring, from + i)); |
| 1416 | cmp_it->nbytes += CHAR_BYTES (c); | 1416 | cmp_it->nbytes += CHAR_BYTES (c); |
| 1417 | cmp_it->width += CHAR_WIDTH (c); | 1417 | cmp_it->width += CHAR_WIDTH (c); |
| 1418 | } | 1418 | } |