summaryrefslogtreecommitdiff
path: root/src/character.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-12-10 16:56:50 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-12-10 16:56:50 -0800
commit8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch)
treec8129448cbbf387fe82667ccac02983592c688f1 /src/character.c
parent85a83e2e2585a1906dec5168ed96ad521b5849ed (diff)
parent7b9d523a07395ecea505be88f45c33d73aea7038 (diff)
downloademacs-8f50130c565eaf0ad7c49e4ad044c3291ecdfa71.tar.gz
Merge from trunk.
Diffstat (limited to 'src/character.c')
-rw-r--r--src/character.c2
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,
}
/* Parse unibyte string at STR of LEN bytes, and return the number of
- bytes it may ocupy when converted to multibyte string by
+ bytes it may occupy when converted to multibyte string by
`str_to_multibyte'. */
ptrdiff_t