Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc Makefile.in
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lisp/emacs-lisp/autoload.el
Simple merge

diff --cc lisp/gnus/gnus.el
Simple merge

diff --cc lisp/help-fns.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/pdumper.c
index de9c06c9d2c2f5fc59957101602caba99afb6a71,bc41afc7c5ad4a4c024811d704273f6a7fe96c26..c55b6f7bb43a3ad771e8b01b2e826cccfe131889
--- 1/src/pdumper.c
--- 2/src/pdumper.c
+++ b/src/pdumper.c
@@@ -4311,12 -4131,11 +4234,12 @@@ types.  */
    /* Emit instructions for Emacs to execute when loading the dump.
       Note that this relocation information ends up in the cold section
       of the dump.  */
 -  drain_reloc_list (ctx, dump_emit_dump_reloc, emacs_reloc_merger,
 -                  &ctx->dump_relocs, &ctx->header.dump_relocs);
 +  for (int i = 0; i < RELOC_NUM_PHASES; ++i)
 +    drain_reloc_list (ctx, dump_emit_dump_reloc, emacs_reloc_merger,
 +                    &ctx->dump_relocs[i], &ctx->header.dump_relocs[i]);
-   unsigned number_hot_relocations = ctx->number_hot_relocations;
+   dump_off number_hot_relocations = ctx->number_hot_relocations;
    ctx->number_hot_relocations = 0;
-   unsigned number_discardable_relocations = ctx->number_discardable_relocations;
+   dump_off number_discardable_relocations = ctx->number_discardable_relocations;
    ctx->number_discardable_relocations = 0;
    drain_reloc_list (ctx, dump_emit_dump_reloc, emacs_reloc_merger,
                    &ctx->object_starts, &ctx->header.object_starts);

diff --cc src/pdumper.h
Simple merge