aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Moellmann2001-07-19 11:20:40 +0000
committerGerd Moellmann2001-07-19 11:20:40 +0000
commitb5b805999858f58ade40aca240d6c0cd06abce68 (patch)
treef04b1e28fbf4e4d8de9581b135de38e45d2bf1fb
parentc1fd92320cf71a46a1350c75292d5f9f47bf88f3 (diff)
downloademacs-b5b805999858f58ade40aca240d6c0cd06abce68.tar.gz
emacs-b5b805999858f58ade40aca240d6c0cd06abce68.zip
(syms_of_composite): Renamed from
syms_of_composition.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/composite.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9202673757e..505945e56b5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12001-07-19 Gerd Moellmann <gerd@gnu.org>
2
3 * composite.h (syms_of_composite): Renamed from
4 syms_of_composition.
5
12001-07-18 Ken Raeburn <raeburn@gnu.org> 62001-07-18 Ken Raeburn <raeburn@gnu.org>
2 7
3 * fns.c (Fset_char_table_default): Check that a charset is defined 8 * fns.c (Fset_char_table_default): Check that a charset is defined
diff --git a/src/composite.h b/src/composite.h
index d1527f53a4b..e30deabb7f6 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,6 +1,7 @@
1/* Header for composite sequence handler. 1/* Header for composite sequence handler.
2 Copyright (C) 1999 Electrotechnical Laboratory, JAPAN. 2 Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
3 Licensed to the Free Software Foundation. 3 Licensed to the Free Software Foundation.
4 Copyright (C) 2001 Free Software Foundation, Inc.
4 5
5This file is part of GNU Emacs. 6This file is part of GNU Emacs.
6 7
@@ -205,7 +206,7 @@ extern void update_compositions P_ ((int, int, int));
205extern void make_composition_value_copy P_ ((Lisp_Object)); 206extern void make_composition_value_copy P_ ((Lisp_Object));
206extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object, 207extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object,
207 Lisp_Object)); 208 Lisp_Object));
208extern void syms_of_composition P_ ((void)); 209extern void syms_of_composite P_ ((void));
209extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object, 210extern void compose_text P_ ((int, int, Lisp_Object, Lisp_Object,
210 Lisp_Object)); 211 Lisp_Object));
211extern void compose_chars_in_text P_ ((int, int, Lisp_Object)); 212extern void compose_chars_in_text P_ ((int, int, Lisp_Object));