aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2012-06-08 12:58:43 +0300
committerEli Zaretskii2012-06-08 12:58:43 +0300
commit8bbbc977a78162c24462d49b76fbf012ca8e7c6d (patch)
tree6f929dccdb41a8786a673bb0bf57119ba156bd3b
parente9f66fcb51971f4cc138979b7f65eac588ee133d (diff)
downloademacs-8bbbc977a78162c24462d49b76fbf012ca8e7c6d.tar.gz
emacs-8bbbc977a78162c24462d49b76fbf012ca8e7c6d.zip
Fix BLOCK_INPUT/UNBLOCK_INPUT mismatch in 2012-06-08T08:44:30Z!dmantipov@yandex.ru.
src/alloc.c (allocate_vectorlike): Fix last change.
-rw-r--r--src/ChangeLog4
-rw-r--r--src/alloc.c5
2 files changed, 8 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index bebb36b50a8..8bc7d6d24a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-06-08 Eli Zaretskii <eliz@gnu.org>
2
3 * alloc.c (allocate_vectorlike): Fix last change.
4
12012-06-08 Dmitry Antipov <dmantipov@yandex.ru> 52012-06-08 Dmitry Antipov <dmantipov@yandex.ru>
2 6
3 Block-based vector allocation of small vectors. 7 Block-based vector allocation of small vectors.
diff --git a/src/alloc.c b/src/alloc.c
index 958da1dbbb0..da2b7ac4330 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3254,7 +3254,10 @@ allocate_vectorlike (ptrdiff_t len)
3254 /* eassert (!handling_signal); */ 3254 /* eassert (!handling_signal); */
3255 3255
3256 if (len == 0) 3256 if (len == 0)
3257 return zero_vector; 3257 {
3258 MALLOC_UNBLOCK_INPUT;
3259 return zero_vector;
3260 }
3258 3261
3259 nbytes = header_size + len * word_size; 3262 nbytes = header_size + len * word_size;
3260 3263