aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2007-12-25 11:07:00 +0000
committerKenichi Handa2007-12-25 11:07:00 +0000
commitddc872bac65df28b19e5a1b85de58068a0559aaf (patch)
tree6b2473f5c241e44b82378754d73d2a6bdc27dece /src
parent95a097c435582932d0e7811303888d752a793d9e (diff)
downloademacs-ddc872bac65df28b19e5a1b85de58068a0559aaf.tar.gz
emacs-ddc872bac65df28b19e5a1b85de58068a0559aaf.zip
(syms_of_composite): Fix docstring of
auto-composition-function.
Diffstat (limited to 'src')
-rw-r--r--src/composite.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/composite.c b/src/composite.c
index a8317968cae..921640c2eb1 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -838,15 +838,15 @@ The default value is the function `compose-chars-after'. */);
838 838
839 DEFVAR_LISP ("auto-composition-function", &Vauto_composition_function, 839 DEFVAR_LISP ("auto-composition-function", &Vauto_composition_function,
840 doc: /* Function to call to compose characters automatically. 840 doc: /* Function to call to compose characters automatically.
841The function is called from the display routine with two arguments, 841The function is called from the display routine with four arguments,
842POS and STRING. 842FROM, TO, WINDOW, and STRING.
843 843
844If STRING is nil, the function must compose characters following POS 844If STRING is nil, the function must compose characters in the region
845in the current buffer. 845between FROM and TO in the current buffer.
846 846
847Otherwise, STRING is a string, and POS is an index to the string. In 847Otherwise, STRING is a string, and FROM and TO are indices into the
848this case, the function must compose characters following POS in 848string. In this case, the function must compose characters in the
849the string. */); 849string. */);
850 Vauto_composition_function = Qnil; 850 Vauto_composition_function = Qnil;
851 851
852 defsubr (&Scompose_region_internal); 852 defsubr (&Scompose_region_internal);