diff options
| author | Dmitry Antipov | 2013-08-03 22:23:23 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-08-03 22:23:23 +0400 |
| commit | 416a3e013f845dc93385cfdf8b95e1f42bab5462 (patch) | |
| tree | fa22afb370345a15db50f99bf90f4b8d7d05d5a4 /src | |
| parent | 75c59fb3ec3188d4c7c20675b7beaa07cb0c1891 (diff) | |
| download | emacs-416a3e013f845dc93385cfdf8b95e1f42bab5462.tar.gz emacs-416a3e013f845dc93385cfdf8b95e1f42bab5462.zip | |
* composite.h (compose_region): Remove the leftover.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/composite.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5d1e8c10320..8f275f0fe89 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * composite.h (composition_temp): Remove declaration. | 4 | * composite.h (composition_temp): Remove declaration. |
| 5 | (COMPOSITION_METHOD, COMPOSITION_VALID_P): Replace with... | 5 | (COMPOSITION_METHOD, COMPOSITION_VALID_P): Replace with... |
| 6 | (composition_method, composition_valid_p): ...inline functions. | 6 | (composition_method, composition_valid_p): ...inline functions. |
| 7 | (compose_region): Remove the leftover. | ||
| 7 | * composite.c (composition_temp): Remove. | 8 | * composite.c (composition_temp): Remove. |
| 8 | (run_composition_function, update_compositions) | 9 | (run_composition_function, update_compositions) |
| 9 | (composition_compute_stop_pos, composition_adjust_point) | 10 | (composition_compute_stop_pos, composition_adjust_point) |
diff --git a/src/composite.h b/src/composite.h index 4fdb2564eb1..fbb5add7c55 100644 --- a/src/composite.h +++ b/src/composite.h | |||
| @@ -195,8 +195,6 @@ extern bool find_composition (ptrdiff_t, ptrdiff_t, ptrdiff_t *, ptrdiff_t *, | |||
| 195 | Lisp_Object *, Lisp_Object); | 195 | Lisp_Object *, Lisp_Object); |
| 196 | extern void update_compositions (ptrdiff_t, ptrdiff_t, int); | 196 | extern void update_compositions (ptrdiff_t, ptrdiff_t, int); |
| 197 | extern void make_composition_value_copy (Lisp_Object); | 197 | extern void make_composition_value_copy (Lisp_Object); |
| 198 | extern void compose_region (int, int, Lisp_Object, Lisp_Object, | ||
| 199 | Lisp_Object); | ||
| 200 | extern void syms_of_composite (void); | 198 | extern void syms_of_composite (void); |
| 201 | extern void compose_text (ptrdiff_t, ptrdiff_t, Lisp_Object, Lisp_Object, | 199 | extern void compose_text (ptrdiff_t, ptrdiff_t, Lisp_Object, Lisp_Object, |
| 202 | Lisp_Object); | 200 | Lisp_Object); |