Merge from trunk.

[gnu-emacs] / src / chartab.c

diff --git a/src/chartab.c b/src/chartab.c
index c3dd1fe5b1525b6bf7808a61e0b91c34bf09bb7a..e125296261241546c1b82eb04b0581776bfe1c0d 100644 (file)
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -747,7 +747,7 @@ equivalent and can be merged.  It defaults to `equal'.  */)
    ARG is passed to C_FUNCTION when that is called.
 
    It returns the value of last character covered by TABLE (not the
-   value inheritted from the parent), and by side-effect, the car part
+   value inherited from the parent), and by side-effect, the car part
    of RANGE is updated to the minimum character C where C and all the
    following characters in TABLE have the same value.  */