Merge from trunk.

[gnu-emacs] / src / character.c

diff --git a/src/character.c b/src/character.c
index d5d89381aaf12e8e8eafef408c8a698a081ebf31..5e2a7b9461cd985f4bc3ecc6ee17cd2cece0960a 100644 (file)
--- 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