aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc.c
diff options
context:
space:
mode:
authorJoakim Verona2015-01-21 00:26:56 +0100
committerJoakim Verona2015-01-21 00:26:56 +0100
commit8628a48fec7fcd8bdbbf6ce5808fc574631d1541 (patch)
tree3dfc3b71850123e7514ddb149a0ba768618cfddf /src/alloc.c
parentffd9ee1d6412a6e61383930562e6167a458f0d5f (diff)
parent0dd19ac82662c5710e73852f438fd55e1d9225b7 (diff)
downloademacs-8628a48fec7fcd8bdbbf6ce5808fc574631d1541.tar.gz
emacs-8628a48fec7fcd8bdbbf6ce5808fc574631d1541.zip
Merge branch 'master' into xwidget
Diffstat (limited to 'src/alloc.c')
-rw-r--r--src/alloc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/alloc.c b/src/alloc.c
index 2c7b02f1158..bf0456c6862 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3175,9 +3175,9 @@ allocate_pseudovector (int memlen, int lisplen,
3175 eassert (lisplen <= (1 << PSEUDOVECTOR_SIZE_BITS) - 1); 3175 eassert (lisplen <= (1 << PSEUDOVECTOR_SIZE_BITS) - 1);
3176 3176
3177 /* Only the first LISPLEN slots will be traced normally by the GC. 3177 /* Only the first LISPLEN slots will be traced normally by the GC.
3178 But since Qnil == 0, we can memset Lisp_Object slots as well. */ 3178 Since Qnil == 0, we can memset Lisp and non-Lisp data at one go. */
3179 verify (NIL_IS_ZERO); 3179 verify (NIL_IS_ZERO);
3180 memset (v->contents, 0, zerolen * word_size); 3180 memsetnil (v->contents, zerolen);
3181 3181
3182 XSETPVECTYPESIZE (v, tag, lisplen, memlen - lisplen); 3182 XSETPVECTYPESIZE (v, tag, lisplen, memlen - lisplen);
3183 return v; 3183 return v;