From: Glenn Morris <rgm@gnu.org>
Date: Thu, 30 Nov 2017 01:12:06 +0000 (-0800)
Subject: ; Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~6114
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=03e1012be4028e653bd88c93846b17172b5c0faa;p=emacs.git

; Merge from origin/emacs-26

The following commit was skipped:

340f74daa8 * src/w32heap.c (DUMPED_HEAP_SIZE) [_WIN64]: Bump to 22 MiB.
---

03e1012be4028e653bd88c93846b17172b5c0faa