aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2000-07-04 07:40:23 +0000
committerKenichi Handa2000-07-04 07:40:23 +0000
commit4a8c194f051259651fe50dee8dcdb4b8760386e1 (patch)
treebeeb2600c593f38fde3091356f3084cf9a66ed72 /src
parent33f37824466d8deaf4780a15a0694e45e9ae96c6 (diff)
downloademacs-4a8c194f051259651fe50dee8dcdb4b8760386e1.tar.gz
emacs-4a8c194f051259651fe50dee8dcdb4b8760386e1.zip
(make_composition_value_copy): Extern it.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog12
-rw-r--r--src/composite.h1
2 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 611bace2375..82730f06721 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
12000-07-04 Kenichi Handa <handa@etl.go.jp>
2
3 * composite.h (make_composition_value_copy): Extern it.
4
5 * composite.c (make_composition_value_copy): New function.
6
7 * editfns.c (Fformat): While copying text properties, make each
8 composition property value a copy.
9
10 * fns.c (concat): While copying text properties, make each
11 composition property value a copy.
12
12000-07-03 Gerd Moellmann <gerd@gnu.org> 132000-07-03 Gerd Moellmann <gerd@gnu.org>
2 14
3 * m/macppc.h (LINKER, LD_SWITCH_MACHINE) [LINUX]: Define. 15 * m/macppc.h (LINKER, LD_SWITCH_MACHINE) [LINUX]: Define.
diff --git a/src/composite.h b/src/composite.h
index a3da0ce9c8b..41be8fdcac7 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -199,6 +199,7 @@ extern int get_composition_id P_ ((int, int, int, Lisp_Object, Lisp_Object));
199extern int find_composition P_ ((int, int, int *, int *, Lisp_Object *, 199extern int find_composition P_ ((int, int, int *, int *, Lisp_Object *,
200 Lisp_Object)); 200 Lisp_Object));
201extern void update_compositions P_ ((int, int, int)); 201extern void update_compositions P_ ((int, int, int));
202extern void make_composition_value_copy P_ ((Lisp_Object));
202extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object, 203extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object,
203 Lisp_Object)); 204 Lisp_Object));
204extern void syms_of_composition P_ ((void)); 205extern void syms_of_composition P_ ((void));