[Emacs-diffs] Changes to emacs/src/composite.h,v [emacs]

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         emacs
Changes by:     Kenichi Handa <handa>   06/06/06 03:48:41

Index: composite.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/composite.h,v
retrieving revision 1.11.6.9
retrieving revision 1.11.6.10
diff -u -b -r1.11.6.9 -r1.11.6.10
--- composite.h 8 Feb 2006 04:24:32 -0000       1.11.6.9
+++ composite.h 6 Jun 2006 03:48:41 -0000       1.11.6.10
@@ -4,7 +4,7 @@
    Copyright (C) 1997
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
-   Copyright (C) 2003
+   Copyright (C) 2003, 2006
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H13PRO009
 
@@ -28,7 +28,7 @@
 #ifndef EMACS_COMPOSITE_H
 #define EMACS_COMPOSITE_H
 
-/* Methods to display a sequence of components a composition.  */
+/* Methods to display a sequence of components of a composition.  */
 enum composition_method {
   /* Compose relatively without alternate characters.  */
   COMPOSITION_RELATIVE,
@@ -40,6 +40,10 @@
   COMPOSITION_WITH_ALTCHARS,
   /* Compose by specified composition rules with alternate characters.  */
   COMPOSITION_WITH_RULE_ALTCHARS,
+#ifdef USE_FONT_BACKEND
+  /* Compose by specified lispy glyph-string.  */
+  COMPOSITION_WITH_GLYPH_STRING,
+#endif  /* USE_FONT_BACKEND */
   /* This is not a method.  */
   COMPOSITION_NO
 };