diff options
| author | Paul Eggert | 2011-04-15 00:48:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-04-15 00:48:51 -0700 |
| commit | 4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9 (patch) | |
| tree | e993b231bb5555c9c961f5d0b20d90ac76f77bbd /src/composite.h | |
| parent | 1963a2e0bb07cc8dee6d27f972f93d9cfd7c6b2d (diff) | |
| parent | 49093f601b69d91126aefd328ee8f6bfeb797407 (diff) | |
| download | emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.tar.gz emacs-4170f62f39edf1ff1e99aec9bfbfe7bbf10e7fc9.zip | |
Merge from mainline.
Diffstat (limited to 'src/composite.h')
| -rw-r--r-- | src/composite.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/composite.h b/src/composite.h index cfb5db0dc6a..5188f981d9c 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -216,8 +216,6 @@ extern int n_compositions; | |||
| 216 | 216 | ||
| 217 | extern Lisp_Object Qcomposition; | 217 | extern Lisp_Object Qcomposition; |
| 218 | extern Lisp_Object composition_hash_table; | 218 | extern Lisp_Object composition_hash_table; |
| 219 | extern Lisp_Object Qauto_composed; | ||
| 220 | extern Lisp_Object Qauto_composition_function; | ||
| 221 | extern int get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT, | 219 | extern int get_composition_id (EMACS_INT, EMACS_INT, EMACS_INT, |
| 222 | Lisp_Object, Lisp_Object); | 220 | Lisp_Object, Lisp_Object); |
| 223 | extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *, | 221 | extern int find_composition (EMACS_INT, EMACS_INT, EMACS_INT *, EMACS_INT *, |
| @@ -328,6 +326,4 @@ extern int composition_update_it (struct composition_it *, | |||
| 328 | 326 | ||
| 329 | extern EMACS_INT composition_adjust_point (EMACS_INT, EMACS_INT); | 327 | extern EMACS_INT composition_adjust_point (EMACS_INT, EMACS_INT); |
| 330 | 328 | ||
| 331 | EXFUN (Fcomposition_get_gstring, 4); | ||
| 332 | |||
| 333 | #endif /* not EMACS_COMPOSITE_H */ | 329 | #endif /* not EMACS_COMPOSITE_H */ |