diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2012-05-23 20:32:28 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-05-23 20:32:28 +0300 |
| commit | 52c55cc7d2bec9795533f58e15c61f7a7b51d1b0 (patch) | |
| tree | 91855df41e7cbffb713b6b8c4ee570082e0b8d0d /src/buffer.c | |
| parent | 1b7e0ab8c77f6a6fdb9758adc7297ac907fee3c5 (diff) | |
| download | emacs-52c55cc7d2bec9795533f58e15c61f7a7b51d1b0.tar.gz emacs-52c55cc7d2bec9795533f58e15c61f7a7b51d1b0.tar.bz2 emacs-52c55cc7d2bec9795533f58e15c61f7a7b51d1b0.zip | |
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/buffer.c')
| -rw-r--r-- | src/buffer.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/buffer.c b/src/buffer.c index 1fea19b0d65..ac14ec9c37c 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -2014,10 +2014,6 @@ advance_to_char_boundary (EMACS_INT byte_pos) return byte_pos; } -#ifdef REL_ALLOC -extern void r_alloc_reset_variable (POINTER_TYPE *, POINTER_TYPE *); -#endif /* REL_ALLOC */ - DEFUN ("buffer-swap-text", Fbuffer_swap_text, Sbuffer_swap_text, 1, 1, 0, doc: /* Swap the text between current buffer and BUFFER. */) @@ -4779,13 +4775,6 @@ mmap_realloc (POINTER_TYPE **var, size_t nbytes) Buffer-text Allocation ***********************************************************************/ -#ifdef REL_ALLOC -extern POINTER_TYPE *r_alloc (POINTER_TYPE **, size_t); -extern POINTER_TYPE *r_re_alloc (POINTER_TYPE **, size_t); -extern void r_alloc_free (POINTER_TYPE **ptr); -#endif /* REL_ALLOC */ - - /* Allocate NBYTES bytes for buffer B's text buffer. */ static void |