Merge from trunk.

[bpt/emacs.git] / src / composite.h

diff --git a/src/composite.h b/src/composite.h
index b21994e..39e82ad 100644 (file)
--- a/src/composite.h
+++ b/src/composite.h
@@ -41,7 +41,7 @@ enum composition_method {
   COMPOSITION_NO
 };
 
-/* Maximum number of compoments a single composition can have.  */
+/* Maximum number of components a single composition can have.  */
 #define MAX_COMPOSITION_COMPONENTS 16
 
 /* These macros access information about a composition that