diff options
| author | Andreas Schwab | 2010-04-24 18:35:43 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-04-24 18:35:43 +0200 |
| commit | 8ed6fc47b790332a282f0b41b9220ebc186c0c4d (patch) | |
| tree | fe69a85b84826c64d2db63aa88ad423c99b041d1 | |
| parent | 063c63240306442ef4cbd82b7b0ca34b04b6a005 (diff) | |
| download | emacs-8ed6fc47b790332a282f0b41b9220ebc186c0c4d.tar.gz emacs-8ed6fc47b790332a282f0b41b9220ebc186c0c4d.zip | |
* composite.el (find-composition): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/composite.el | 2 |
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 @@ | |||
| 1 | 2010-04-24 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * composite.el (find-composition): Doc fix. | ||
| 4 | |||
| 1 | 2010-04-24 Juanma Barranquero <lekktu@gmail.com> | 5 | 2010-04-24 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * progmodes/sql.el (sql-electric-stuff): Fix typo in tag. | 7 | * 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. | |||
| 331 | 331 | ||
| 332 | WIDTH is a number of columns the composition occupies on the screen. | 332 | WIDTH is a number of columns the composition occupies on the screen. |
| 333 | 333 | ||
| 334 | When Automatic Compostion mode is on, this function also finds a | 334 | When Automatic Composition mode is on, this function also finds a |
| 335 | chunk of text that is automatically composed. If such a chunk is | 335 | chunk of text that is automatically composed. If such a chunk is |
| 336 | found closer to POS than the position that has `composition' | 336 | found closer to POS than the position that has `composition' |
| 337 | property, the value is a list of FROM, TO, and a glyph gstring | 337 | property, the value is a list of FROM, TO, and a glyph gstring |