summaryrefslogtreecommitdiff
path: root/src/ralloc.c
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2012-05-23 20:32:28 +0300
committerEli Zaretskii <eliz@gnu.org>2012-05-23 20:32:28 +0300
commit52c55cc7d2bec9795533f58e15c61f7a7b51d1b0 (patch)
tree91855df41e7cbffb713b6b8c4ee570082e0b8d0d /src/ralloc.c
parent1b7e0ab8c77f6a6fdb9758adc7297ac907fee3c5 (diff)
downloademacs-52c55cc7d2bec9795533f58e15c61f7a7b51d1b0.tar.gz
Fix bug #11519 with relocation of buffer text during regex search.
src/lisp.h [REL_ALLOC]: Add prototypes for external functions defined on ralloc.c. src/buffer.c [REL_ALLOC]: Remove prototypes of r_alloc_reset_variable, r_alloc, r_re_alloc, and r_alloc_free, they are now on lisp.h. src/ralloc.c (r_alloc_inhibit_buffer_relocation): New function. src/search.c (search_buffer): Use it to inhibit relocation of buffer text while re_search_2 is doing its job, because re_search_2 is passed C pointers to buffer text.
Diffstat (limited to 'src/ralloc.c')
-rw-r--r--src/ralloc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ralloc.c b/src/ralloc.c
index 896ad9f3155..db3638a54e6 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1201,6 +1201,12 @@ r_alloc_reset_variable (POINTER *old, POINTER *new)
bloc->variable = new;
}
+void
+r_alloc_inhibit_buffer_relocation (int inhibit)
+{
+ use_relocatable_buffers = !inhibit;
+}
+
/***********************************************************************
Initialization