From: Juanma Barranquero Date: Wed, 25 Mar 2009 12:02:15 +0000 (+0000) Subject: * composite.el (auto-compose-chars): Fix typo in docstring. X-Git-Tag: emacs-pretest-23.0.92~68 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1ce3d35b78955a84b95cbebb02763106cbe59527;p=emacs.git * composite.el (auto-compose-chars): Fix typo in docstring. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0cd63d7dec7..bb0d3598b00 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-03-25 Juanma Barranquero + + * composite.el (auto-compose-chars): Fix typo in docstring. + 2009-03-24 Michael Albinus * net/ange-ftp.el (ange-ftp-skip-msgs): Add 534. diff --git a/lisp/composite.el b/lisp/composite.el index 7c04bcff088..d3c000fe839 100644 --- 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