Merge from origin/emacs-25

ee04aed Fix handling of buffer relocation in regex.c functions
71ca4f6 Avoid relocating buffers while libxml2 reads its text
1b3fc8a ; Remove redundant code in gmalloc.c
9afea93 Attempt to catch reads from a buffer that is relocated

diff --cc src/gmalloc.c
index 33d424fe9af1f7a591952363b156d86f16b26f03,d2762d74e53008fb819d672d2bd613eb81d2c855..6ca35ec5f1513f75f517d469f33351f71f7c3b92
--- 1/src/gmalloc.c
--- 2/src/gmalloc.c
+++ b/src/gmalloc.c
@@@ -35,27 -39,8 +35,23 @@@ License along with this library.  If no
  #include <pthread.h>
  #endif
  
- #ifdef WINDOWSNT
- #include <w32heap.h>  /* for sbrk */
- #endif
- 
  #ifdef emacs
 -extern void emacs_abort (void);
 +# include "lisp.h"
 +#endif
 +
 +#ifdef HAVE_MALLOC_H
 +# if GNUC_PREREQ (4, 2, 0)
 +#  pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 +# endif
 +# include <malloc.h>
 +#endif
 +#ifndef __MALLOC_HOOK_VOLATILE
 +# define __MALLOC_HOOK_VOLATILE volatile
 +#endif
 +#ifndef HAVE_MALLOC_H
 +extern void (*__MALLOC_HOOK_VOLATILE __after_morecore_hook) (void);
 +extern void (*__MALLOC_HOOK_VOLATILE __malloc_initialize_hook) (void);
 +extern void *(*__morecore) (ptrdiff_t);
  #endif
  
  /* If HYBRID_MALLOC is defined, then temacs will use malloc,

diff --cc src/search.c
Simple merge

diff --cc src/xml.c
Simple merge