summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/composite.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d09d201f880..b85063dc20c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-24 Andreas Schwab <schwab@linux-m68k.org>
+
+ * composite.el (find-composition): Doc fix.
+
2010-04-24 Juanma Barranquero <lekktu@gmail.com>
* progmodes/sql.el (sql-electric-stuff): Fix typo in tag.
diff --git a/lisp/composite.el b/lisp/composite.el
index 6a12b42e411..e3753f3bfd0 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -331,7 +331,7 @@ MOD-FUNC is a modification function of the composition.
WIDTH is a number of columns the composition occupies on the screen.
-When Automatic Compostion mode is on, this function also finds a
+When Automatic Composition mode is on, this function also finds a
chunk of text that is automatically composed. If such a chunk is
found closer to POS than the position that has `composition'
property, the value is a list of FROM, TO, and a glyph gstring