Mercurial > emacs

changeset 102727:519b650e6d27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* composite.el (auto-compose-chars): Fix typo in docstring.
author Juanma Barranquero <lekktu@gmail.com>
date Wed, 25 Mar 2009 12:02:15 +0000
parents 93ad3a5a4f75
children 03dcad98e4eb
files lisp/ChangeLog lisp/composite.el
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Wed Mar 25 11:58:43 2009 +0000
+++ b/lisp/ChangeLog	Wed Mar 25 12:02:15 2009 +0000
@@ -1,3 +1,7 @@
+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	Wed Mar 25 11:58:43 2009 +0000
+++ b/lisp/composite.el	Wed Mar 25 12:02:15 2009 +0000
@@ -712,9 +712,7 @@
 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