diff options
| author | Joakim Verona | 2015-01-11 18:40:21 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-01-11 18:40:21 +0100 |
| commit | cc7cb20d6abc0f862e5513b24831bba0eaecaa5f (patch) | |
| tree | afc2fc05401504aa0c28699dc3bc155c5b0d7f58 /src/composite.h | |
| parent | d972b504f30ff4300ba368940751e8736dddf0b4 (diff) | |
| parent | 9a57bda31569294ecaf8138a06e5edda9c0d87e3 (diff) | |
| download | emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.tar.gz emacs-cc7cb20d6abc0f862e5513b24831bba0eaecaa5f.zip | |
merge master, fix conflicts
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 e0d4e858d48..fb9f9eb8655 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -190,7 +190,6 @@ extern ptrdiff_t n_compositions; | |||
| 190 | #define CHECK_BORDER (CHECK_HEAD | CHECK_TAIL) | 190 | #define CHECK_BORDER (CHECK_HEAD | CHECK_TAIL) |
| 191 | #define CHECK_ALL (CHECK_BORDER | CHECK_INSIDE) | 191 | #define CHECK_ALL (CHECK_BORDER | CHECK_INSIDE) |
| 192 | 192 | ||
| 193 | extern Lisp_Object Qcomposition; | ||
| 194 | extern Lisp_Object composition_hash_table; | 193 | extern Lisp_Object composition_hash_table; |
| 195 | extern ptrdiff_t get_composition_id (ptrdiff_t, ptrdiff_t, ptrdiff_t, | 194 | extern ptrdiff_t get_composition_id (ptrdiff_t, ptrdiff_t, ptrdiff_t, |
| 196 | Lisp_Object, Lisp_Object); | 195 | Lisp_Object, Lisp_Object); |