diff options
| author | Juanma Barranquero <[email protected]> | 2009-03-25 12:02:15 +0000 |
|---|---|---|
| committer | Juanma Barranquero <[email protected]> | 2009-03-25 12:02:15 +0000 |
| commit | 1ce3d35b78955a84b95cbebb02763106cbe59527 (patch) | |
| tree | 2c98f26de3da181102ffbd9bafd4344f26d3adf1 /lisp | |
| parent | 087e2ea9553da5bf4a707c656a224f69c9426035 (diff) | |
* composite.el (auto-compose-chars): Fix typo in docstring.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/composite.el | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0cd63d7dec..bb0d3598b0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2009-03-25 Juanma Barranquero <[email protected]> + + * composite.el (auto-compose-chars): Fix typo in docstring. + 2009-03-24 Michael Albinus <[email protected]> * net/ange-ftp.el (ange-ftp-skip-msgs): Add 534. diff --git a/lisp/composite.el b/lisp/composite.el index 7c04bcff08..d3c000fe83 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 |