diff options
| author | Stefan Monnier | 2010-08-11 07:42:48 +0200 |
|---|---|---|
| committer | Stefan Monnier | 2010-08-11 07:42:48 +0200 |
| commit | c566235d981eba73c88bbff00b6a1d88360b6e9f (patch) | |
| tree | f8d653add3570fe750a83d1123ed35022e0bf4ef /src/character.c | |
| parent | 0bfdb86f425a88fe43ebc88851c6f9a6418e1862 (diff) | |
| parent | 490b89acab3e759426ede25c31c94268df55e925 (diff) | |
| download | emacs-c566235d981eba73c88bbff00b6a1d88360b6e9f.tar.gz emacs-c566235d981eba73c88bbff00b6a1d88360b6e9f.zip | |
Merge from trunk
Diffstat (limited to 'src/character.c')
| -rw-r--r-- | src/character.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/character.c b/src/character.c index 470157b36ed..c4a3a008bcd 100644 --- a/src/character.c +++ b/src/character.c | |||
| @@ -430,7 +430,7 @@ c_string_width (const unsigned char *str, int len, int precision, int *nchars, i | |||
| 430 | occupies on the screen. */ | 430 | occupies on the screen. */ |
| 431 | 431 | ||
| 432 | int | 432 | int |
| 433 | strwidth (unsigned char *str, int len) | 433 | strwidth (const unsigned char *str, int len) |
| 434 | { | 434 | { |
| 435 | return c_string_width (str, len, -1, NULL, NULL); | 435 | return c_string_width (str, len, -1, NULL, NULL); |
| 436 | } | 436 | } |
| @@ -710,9 +710,9 @@ str_as_multibyte (unsigned char *str, int len, int nbytes, int *nchars) | |||
| 710 | `str_to_multibyte'. */ | 710 | `str_to_multibyte'. */ |
| 711 | 711 | ||
| 712 | int | 712 | int |
| 713 | parse_str_to_multibyte (unsigned char *str, int len) | 713 | parse_str_to_multibyte (const unsigned char *str, int len) |
| 714 | { | 714 | { |
| 715 | unsigned char *endp = str + len; | 715 | const unsigned char *endp = str + len; |
| 716 | int bytes; | 716 | int bytes; |
| 717 | 717 | ||
| 718 | for (bytes = 0; str < endp; str++) | 718 | for (bytes = 0; str < endp; str++) |