diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-25 14:34:39 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-25 14:34:39 -0700 |
| commit | 77b37c05572d1028d0ec2c264ac0ed3a89c0f4da (patch) | |
| tree | cb5140f5f92f5f91bb9e8846e5254fc58df52cc4 /src/composite.c | |
| parent | b102ceb110a9cd38f5c589c1869747b1e1c792cb (diff) | |
| download | emacs-77b37c05572d1028d0ec2c264ac0ed3a89c0f4da.tar.gz | |
* lisp.h: (XVECTOR_SIZE): Remove. All uses replaced with ASIZE.
(ASIZE): Now contains previous implementation of XVECTOR_SIZE
instead of invoking XVECTOR_SIZE.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/composite.c b/src/composite.c index aa6090084a0..f069acce1c0 100644 --- a/src/composite.c +++ b/src/composite.c @@ -293,7 +293,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, } else if (VECTORP (components) || CONSP (components)) { - EMACS_UINT len = XVECTOR_SIZE (key); + EMACS_UINT len = ASIZE (key); /* The number of elements should be odd. */ if ((len % 2) == 0) @@ -326,8 +326,8 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, : COMPOSITION_WITH_RULE_ALTCHARS)); cmp->hash_index = hash_index; glyph_len = (cmp->method == COMPOSITION_WITH_RULE_ALTCHARS - ? (XVECTOR_SIZE (key) + 1) / 2 - : XVECTOR_SIZE (key)); + ? (ASIZE (key) + 1) / 2 + : ASIZE (key)); cmp->glyph_len = glyph_len; cmp->offsets = (short *) xmalloc (sizeof (short) * glyph_len * 2); cmp->font = NULL; |