Merge from origin/emacs-25

ac00a92 Make sh-electric-here-document-mode accessible in sh-mode-hoo...
3287f48 ; Add entry to MAINTAINERS
b85981f * configure.ac (HAVE_MODULES): Exclude gnu-kfreebsd from prev...
0f33284 Make use of rectangle-preview custom variable.
aa0d83a Make use of rectangle-preview face.
33bef6e Use 'grep-find-program' in check-declare.el
a8560e5 Improve "C-h S" for cl-lib symbols
52e798b Fix minor issues with removing left or right fringes
d6ffd64 Speed up redisplay in ansi-term mode
4ab671c Simplify 8-bit character handling by terminal for 'raw-text'
f3653ec * configure.ac (HAVE_MODULES): Treat gnu like gnu-linux.  (Bu...
ab849b7 Fix w32 memory-management problem when extending buffer text

1 files changed, 4 insertions, 4 deletions

diff --git a/src/w32heap.c b/src/w32heap.c
index df2fe0a8fa3..6643b439a26 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -714,13 +714,12 @@ mmap_realloc (void **var, size_t nbytes)
       /* If there is enough room in the current reserved area, then
          commit more pages as needed.  */
       if (m2.State == MEM_RESERVE
+          && m2.AllocationBase == memInfo.AllocationBase
           && nbytes <= memInfo.RegionSize + m2.RegionSize)
         {
           void *p;
 
-          p = VirtualAlloc (*var + memInfo.RegionSize,
-                            nbytes - memInfo.RegionSize,
-                            MEM_COMMIT, PAGE_READWRITE);
+          p = VirtualAlloc (*var, nbytes, MEM_COMMIT, PAGE_READWRITE);
           if (!p /* && GetLastError() != ERROR_NOT_ENOUGH_MEMORY */)
             {
               DebPrint (("realloc enlarge: VirtualAlloc (%p + %I64x, %I64x) error %ld\n",
@@ -728,7 +727,8 @@ mmap_realloc (void **var, size_t nbytes)
                          (uint64_t)(nbytes - memInfo.RegionSize),
                          GetLastError ()));
               DebPrint (("next region: %p %p %I64x %x\n", m2.BaseAddress,
-                         m2.AllocationBase, m2.RegionSize, m2.AllocationProtect));
+                         m2.AllocationBase, (uint64_t)m2.RegionSize,
+                         m2.AllocationProtect));
             }
           else
             return *var;