* composite.el (auto-compose-chars): Fix typo in docstring.

1ce3d35b · Juanma Barranquero · 087e2ea9 · 1ce3d35b · 1ce3d35b
Commit 1ce3d35b authored Mar 25, 2009 by Juanma Barranquero
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/composite.el lisp/composite.el +1 -3

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+2009-03-25  Juanma Barranquero  <lekktu@gmail.com>
+
+	* composite.el (auto-compose-chars): Fix typo in docstring.
+
 2009-03-24  Michael Albinus  <michael.albinus@gmx.de>
  
 	* net/ange-ftp.el (ange-ftp-skip-msgs): Add 534.

--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -712,9 +712,7 @@ FUNC is called with one argument GSTRING which is built for characters
 in the region FROM (inclusive) and TO (exclusive).

 If the character are composed on a graphic display, FONT-OBJECT
-is a font to use.
-
-Otherwise, FONT-OBJECT is nil, and the fucntion
+is a font to use.  Otherwise, FONT-OBJECT is nil, and the function
 `compose-gstring-for-terminal' is used instead of FUNC.

 If STRING is non-nil, it is a string, and FROM and TO are indices