diff options
| author | Noam Postavsky <npostavs@gmail.com> | 2018-06-10 18:43:49 -0400 |
|---|---|---|
| committer | Noam Postavsky <npostavs@gmail.com> | 2018-06-10 18:43:49 -0400 |
| commit | 7adf1a361db3a2e9b7a27d76946482276c24fb64 (patch) | |
| tree | 32a993c24df839661f467ea54bd1000e68e2282b /src/w32heap.c | |
| parent | 78ac2480d7bd206f3207398a31830bf0625caf0a (diff) | |
| parent | 3434edc731e4602891a9cf6418ec4e5ff2f60830 (diff) | |
| download | emacs-7adf1a361db3a2e9b7a27d76946482276c24fb64.tar.gz emacs-7adf1a361db3a2e9b7a27d76946482276c24fb64.tar.bz2 emacs-7adf1a361db3a2e9b7a27d76946482276c24fb64.zip | |
Merge from emacs-26
3434edc731 Enlarge DUMPED_HEAP_SIZE for 64-bit Windows builds
36bbdfc017 Update Unicode data files to version 11.0.0 of Unicode
b7b7a5f4f3 * etc/NEWS: Belatedly call out vc-hg changes in v26.1. (B...
5b6f8b54d1 Clarify the documentation of 'dired-recursive-deletes'
9db97b49cd ; * etc/DEBUG: Add information about debugging libXft prob...
0214ffbe60 Clarify doc string of 'update-glyphless-char-display'
ef35d405b1 Clarify subtle issues with 'eq' in byte-compiled code
c6ef3c8321 Make cl-print respect print-quoted (bug#31649)
26b52ac40e Fix unexpected jumps of window-point in 'set-window-config...
4af077ab4d * etc/emacs.appdata.xml: Update Emacs screenshot.
e5ab25deae Fix cursor movement by 'next-logical-line' after 'next-line'
d20beef5f1 Fix prompt in bookmark.el (Bug#24726)
c57e7eaae8 Improve documentation of 'empty' whitespace-style
# Conflicts:
# etc/NEWS
Diffstat (limited to 'src/w32heap.c')
| -rw-r--r-- | src/w32heap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/w32heap.c b/src/w32heap.c index a3f87bfc7e6..df79f8c2cef 100644 --- a/src/w32heap.c +++ b/src/w32heap.c @@ -116,7 +116,7 @@ typedef struct _RTL_HEAP_PARAMETERS { to build only the first bootstrap-emacs.exe with the large size, and reset that to a lower value afterwards. */ #if defined _WIN64 || defined WIDE_EMACS_INT -# define DUMPED_HEAP_SIZE (22*1024*1024) +# define DUMPED_HEAP_SIZE (23*1024*1024) #else # define DUMPED_HEAP_SIZE (13*1024*1024) #endif |