summaryrefslogtreecommitdiff
path: root/src/composite.c
diff options
context:
space:
mode:
authorDmitry Antipov <dmantipov@yandex.ru>2013-09-24 10:43:20 +0400
committerDmitry Antipov <dmantipov@yandex.ru>2013-09-24 10:43:20 +0400
commitd6d9cbc15cbebfe466756a7a75601173c15287a2 (patch)
tree2f3e5223e8f8d637dc9c3c152929b879748b7918 /src/composite.c
parentec7bc82f9c63b6ec533f7489e67b1c1b18d08dd5 (diff)
downloademacs-d6d9cbc15cbebfe466756a7a75601173c15287a2.tar.gz
emacs-d6d9cbc15cbebfe466756a7a75601173c15287a2.tar.bz2
emacs-d6d9cbc15cbebfe466756a7a75601173c15287a2.zip
Use union for the payload of struct Lisp_Vector.
This helps to avoid a few glitches dictated by C's aliasing rules. * lisp.h (struct Lisp_Vector): Use union for next and contents member. Adjust comment. Change related users. * alloc.c (next_in_free_list, set_next_in_free_list): Remove. Related users changed. * buffer.c, bytecode.c, ccl.c, character.h, chartab.c, composite.c: * composite.h, disptab.h, fns.c, fontset.c, indent.c, keyboard.c: * lread.c, msdos.c, process.c, w32menu.c, window.c, xdisp.c: * xfaces.c, xfont.c, xmenu.c: Related users changed.
Diffstat (limited to 'src/composite.c')
-rw-r--r--src/composite.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/composite.c b/src/composite.c
index 47cac715086..4f125522e38 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -266,7 +266,7 @@ get_composition_id (ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t nchars,
composition_table = xpalloc (composition_table, &composition_table_size,
1, -1, sizeof *composition_table);
- key_contents = XVECTOR (key)->contents;
+ key_contents = XVECTOR (key)->u.contents;
/* Check if the contents of COMPONENTS are valid if COMPONENTS is a
vector or a list. It should be a sequence of: