diff options
| author | Paul Eggert | 2011-12-10 16:56:50 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-12-10 16:56:50 -0800 |
| commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
| tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/character.c | |
| parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
| parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) | |
| download | emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz emacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.zip | |
Merge from trunk.
Diffstat (limited to 'src/character.c')
| -rw-r--r-- | src/character.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/character.c b/src/character.c index d5d89381aaf..5e2a7b9461c 100644 --- a/src/character.c +++ b/src/character.c | |||
| @@ -670,7 +670,7 @@ str_as_multibyte (unsigned char *str, ptrdiff_t len, ptrdiff_t nbytes, | |||
| 670 | } | 670 | } |
| 671 | 671 | ||
| 672 | /* Parse unibyte string at STR of LEN bytes, and return the number of | 672 | /* Parse unibyte string at STR of LEN bytes, and return the number of |
| 673 | bytes it may ocupy when converted to multibyte string by | 673 | bytes it may occupy when converted to multibyte string by |
| 674 | `str_to_multibyte'. */ | 674 | `str_to_multibyte'. */ |
| 675 | 675 | ||
| 676 | ptrdiff_t | 676 | ptrdiff_t |