# HG changeset patch # User Gerd Moellmann # Date 968442777 0 # Node ID 84ba6f2b7d60d479d78551498bf656288a379ea4 # Parent 92dec3ff92a1bcef6bb65ab143862531e6e26717 *** empty log message *** diff -r 92dec3ff92a1 -r 84ba6f2b7d60 src/ChangeLog --- a/src/ChangeLog Fri Sep 08 19:52:38 2000 +0000 +++ b/src/ChangeLog Fri Sep 08 19:52:57 2000 +0000 @@ -1,5 +1,16 @@ 2000-09-08 Gerd Moellmann + * ralloc.c (mmap_fd): Remove initializer which can make it + read-only in a dumped Emacs. + (mmap_fd_1): New variable. + (mmap_set_vars): Remove local `fd'. Save mmap_fd in mmap_fd_1, + restore it from there. + (r_alloc, r_re_alloc, r_alloc_free): Call r_alloc_init + unconditionally so that mmap_fd can be initialized there. + (r_alloc_init_fd): Open-coded in r_alloc_init; function removed. + (r_alloc_init) [REL_ALLOC_MMAP && !MAP_ANON]: Open /dev/zero. + (r_alloc_init) [REL_ALLOC_MMAP && MAP_ANON]: Set mmap_fd to -1. + * xfaces.c (Finternal_merge_in_global_face): Return a Lisp object. * xdisp.c (dump_glyph_row): Fix printf format string.