Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk

diff --cc .gitignore
index 72813833237c471ce7ce63b8e4eb574a682c50e4,c262f39126dd403ca9f9fe4cd89d7e076f119dde..7be876b944440728bfff449581ba4aee614cc5d4
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -302,5 -304,8 +304,11 @@@ nt/emacsclient.r
  src/gdb.ini
  /var/
  
+ # Seccomp filter files.
+ lib-src/seccomp-filter.bpf
+ lib-src/seccomp-filter.pfc
+ lib-src/seccomp-filter-exec.bpf
+ lib-src/seccomp-filter-exec.pfc
++
 +# gsettings schema
 +/etc/*.gschema.valid

diff --cc configure.ac
index 17e5fcf211c9b2945c3a40227061853880808187,d3647bdc2a2c1d6260f1d4a3ff7792933aca3686..fc95d19ee289b022710bf6680fd3c632490eb6ff
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -5751,7 -5694,8 +5773,8 @@@ optsep
  emacs_config_features=
  for opt in ACL CAIRO DBUS FREETYPE GCONF GIF GLIB GMP GNUTLS GPM GSETTINGS \
   HARFBUZZ IMAGEMAGICK JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 \
-  M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SOUND THREADS TIFF \
 - M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PNG RSVG SECCOMP SOUND \
++ M17N_FLT MODULES NOTIFY NS OLDXMENU PDUMPER PGTK PNG RSVG SECCOMP SOUND \
+  THREADS TIFF \
   TOOLKIT_SCROLL_BARS UNEXEC X11 XAW3D XDBE XFT XIM XPM XWIDGETS X_TOOLKIT \
   ZLIB; do
  

diff --cc lisp/cus-edit.el
Simple merge

diff --cc lisp/frame.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/net/eww.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/image.c
index 107670d72c131372937b09840fef2502bd258e16,ff4ef018044f9179f58cb69b1a1f0ab304bac97f..96084068dcdcd896cc5f90f444f176e8090fa5b0
--- 1/src/image.c
--- 2/src/image.c
+++ b/src/image.c
@@@ -9342,13 -9230,9 +9364,13 @@@ imagemagick_load_image (struct frame *f
      PixelSetBlue  (bg_wand, (double) bgcolor.blue  / 65535);
    }
  
 +#ifndef DONT_CREATE_TRANSFORMED_IMAGEMAGICK_IMAGE
    compute_image_size (MagickGetImageWidth (image_wand),
                      MagickGetImageHeight (image_wand),
-                     img->spec, &desired_width, &desired_height);
+                     img, &desired_width, &desired_height);
 +#else
 +  desired_width = desired_height = -1;
 +#endif
  
    if (desired_width != -1 && desired_height != -1)
      {

diff --cc src/window.h
Simple merge

diff --cc src/xdisp.c
Simple merge