procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Do not use global Lisp_Object in composition macros.

Browse source 
* composite.h (composition_temp): Remove declaration.
(COMPOSITION_METHOD, COMPOSITION_VALID_P): Replace with...
(composition_method, composition_valid_p): ...inline functions.
* composite.c (composition_temp): Remove.
(run_composition_function, update_compositions)
(composition_compute_stop_pos, composition_adjust_point)
(Ffind_composition_internal):
* coding.c (handle_composition_annotation):
* xdisp.c (handle_composition_prop, check_point_in_composition):
Related users changed.
This commit is contained in:
Dmitry Antipov 2013-08-03 22:16:43 +04:00
parent 5e471f0dbc
commit 75c59fb3ec
5 changed files with 68 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/coding.c
View file

@ -7497,7 +7497,7 @@ handle_composition_annotation (ptrdiff_t pos, ptrdiff_t limit,
/* We found a composition. Store the corresponding
annotation data in BUF. */
int *head = buf;
enum composition_method method = COMPOSITION_METHOD (prop);
enum composition_method method = composition_method (prop);
int nchars = COMPOSITION_LENGTH (prop);
ADD_COMPOSITION_DATA (buf, nchars, 0, method);