Remove the vc-dir-insert-directories global.

[bpt/emacs.git] / src / composite.c

diff --git a/src/composite.c b/src/composite.c
index a831796..52fae55 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -1,7 +1,7 @@
 /* Composite sequence support.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006, 2007 Free Software Foundation, Inc.
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+                 2006, 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
    Copyright (C) 2003, 2006
@@ -801,7 +801,7 @@ syms_of_composite ()
     args[1] = Qequal;
     args[2] = QCweakness;
     /* We used to make the hash table weak so that unreferenced
-       compostions can be garbage-collected.  But, usually once
+       compositions can be garbage-collected.  But, usually once
        created compositions are repeatedly used in an Emacs session,
        and thus it's not worth to save memory in such a way.  So, we
        make the table not weak.  */
@@ -838,15 +838,15 @@ The default value is the function `compose-chars-after'.  */);
 
   DEFVAR_LISP ("auto-composition-function", &Vauto_composition_function,
               doc: /* Function to call to compose characters automatically.
-The function is called from the display routine with two arguments,
-POS and STRING.
+The function is called from the display routine with four arguments,
+FROM, TO, WINDOW, and STRING.
 
-If STRING is nil, the function must compose characters following POS
-in the current buffer.
+If STRING is nil, the function must compose characters in the region
+between FROM and TO in the current buffer.
 
-Otherwise, STRING is a string, and POS is an index to the string.  In
-this case, the function must compose characters following POS in
-the string.  */);
+Otherwise, STRING is a string, and FROM and TO are indices into the
+string.  In this case, the function must compose characters in the
+string.  */);
   Vauto_composition_function = Qnil;
 
   defsubr (&Scompose_region_internal);