*** empty log message ***

[gnu-emacs] / src / composite.h

diff --git a/src/composite.h b/src/composite.h
index d1527f53a4bd7dd54d6e21d65705585f3cfb6c74..5343dd51469b314072391e96259186321951df71 100644 (file)
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,6 +1,7 @@
 /* Header for composite sequence handler.
    Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
    Licensed to the Free Software Foundation.
+   Copyright (C) 2001 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -75,7 +76,7 @@ extern Lisp_Object composition_temp;
 #define COMPOSITION_MODIFICATION_FUNC(prop)    \
   (COMPOSITION_REGISTERD_P (prop)              \
    ? XCDR (XCDR (XCDR (prop)))                 \
-   : XCDR (prop))
+   : CONSP (prop) ? XCDR (prop) : Qnil)
 
 /* Return the method of composition.  */
 #define COMPOSITION_METHOD(prop)                                       \
@@ -146,7 +147,7 @@ extern Lisp_Object composition_temp;
 
    When a composition is assigned an ID number (by
    get_composition_id), this structure is allocated for the
-   composition and linked in composition_table[ID].  
+   composition and linked in composition_table[ID].
 
    Identical compositions appearing at different places have the same
    ID, and thus share the same instance of this structure.  */
@@ -205,9 +206,12 @@ extern void update_compositions P_ ((int, int, int));
 extern void make_composition_value_copy P_ ((Lisp_Object));
 extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object,
                                Lisp_Object));
-extern void syms_of_composition P_ ((void));
+extern void syms_of_composite P_ ((void));
 extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object,
                              Lisp_Object));
 extern void compose_chars_in_text P_ ((int, int, Lisp_Object));
 
 #endif /* not EMACS_COMPOSITE_H */
+
+/* arch-tag: 59524d89-c645-47bd-b5e6-65e861690118
+   (do not change this comment) */