diff options
| author | Miles Bader <miles@gnu.org> | 2005-09-19 10:20:33 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-09-19 10:20:33 +0000 |
| commit | 6f512f0b53ba23b88c686d27a748797add0a89dc (patch) | |
| tree | 03b4e8c24f256dc8d90330ab1021d5ac238508d2 /src/composite.h | |
| parent | ff8d296438e69b8cf701d95b6ccd271c416c46fd (diff) | |
| parent | 430d3ed772627a9a23fccdeab2b868c6c41e8365 (diff) | |
| download | emacs-6f512f0b53ba23b88c686d27a748797add0a89dc.tar.gz | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/composite.h b/src/composite.h index fe931a579ae..37a75c8a80b 100644 --- a/src/composite.h +++ b/src/composite.h @@ -221,7 +221,6 @@ extern void compose_region P_ ((int, int, Lisp_Object, Lisp_Object, 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 */ |