Update from Gnulib

Make the following changes by hand, and run 'admin/merge-gnulib'.
* .gitignore: Add lib/malloc/*.gl.h.
* admin/merge-gnulib: Copy lib/af_alg.h and lib/save-cwd.h
directly from Gnulib, without worrying about Gnulib modules,
as these files are special cases.
(AVOIDED_MODULES): Remove malloc-posix.
* lib/malloc.c, lib/realloc.c, m4/malloc.m4, m4/realloc.m4:
* m4/year2038.m4: New files, copied from Gnulib.
* lib/malloca.c, lib/malloca.h:
* m4/close-stream.m4, m4/glibc21.m4, m4/malloca.m4:
Remove.  These are either no longer present in Gnulib, or are no
longer needed by modules that Emacs uses.
* oldXMenu/AddPane.c, oldXmenu/Addsel.c: Include XmenuInt.h first;
needed for new Gnulib.
* src/xmenu.c: Call emacs_abort, not abort.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/xmenu.c b/src/xmenu.c
index 709e455dd05..ea2cbab2030 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1605,11 +1605,11 @@ x_menu_show (struct frame *f, int x, int y, int menuflags,
             prev_wv->next = wv;
           else if (!save_wv)
             {
-              /* This call to 'abort' pacifies gcc 11.2.1 when Emacs
+              /* This emacs_abort call pacifies gcc 11.2.1 when Emacs
                  is configured with --enable-gcc-warnings.  FIXME: If
                  save_wv can be null, do something better; otherwise,
                  explain why save_wv cannot be null.  */
-              abort ();
+              emacs_abort ();
             }
           else
             save_wv->contents = wv;