Merge remote-tracking branch 'origin/master' into scratch/pkg

diff --cc .gitignore
index e3a628eecb8534f788936528a54576cf5b28d02f,889008dd96d6b3662be2a8b6e7eb6063b647e3cb..b1bf157cb3ddc698eec45bace31fe1254cc4110d
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -338,4 -372,15 +372,16 @@@ lib-src/seccomp-filter-exec.pf
  # GDB history
  .gdb_history
  _gdb_history
 +*.desktop
+ 
+ # Files ignored in exec/.
+ exec/config.status
+ exec/loader
+ exec/test
+ exec/exec1
+ exec/deps/*
+ exec/autom4te.cache
+ exec/config.h
+ exec/config-mips.m4
+ exec/configure
+ exec/*.s.s

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

diff --cc lisp/files.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/minibuffer.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/doc.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/font.c
Simple merge

diff --cc src/image.c
Simple merge

diff --cc src/lisp.h
index 90bbdde073e5a9cf4b9605bfc01038d7fb853082,447912581d742d39d06987a02804406d1ca61b00..115796bf926a9bc8de1cf4eb2ad2aade61b44328
--- 1/src/lisp.h
--- 2/src/lisp.h
+++ b/src/lisp.h
@@@ -4612,9 -4515,12 +4617,10 @@@ extern bool suffix_p (Lisp_Object, cons
  extern Lisp_Object save_match_data_load (Lisp_Object, Lisp_Object, Lisp_Object,
                                         Lisp_Object, Lisp_Object);
  extern int openp (Lisp_Object, Lisp_Object, Lisp_Object,
-                   Lisp_Object *, Lisp_Object, bool, bool);
+                   Lisp_Object *, Lisp_Object, bool, bool,
+                 void **);
  enum { S2N_IGNORE_TRAILING = 1 };
  extern Lisp_Object string_to_number (char const *, int, ptrdiff_t *);
 -extern void map_obarray (Lisp_Object, void (*) (Lisp_Object, Lisp_Object),
 -                         Lisp_Object);
  extern void dir_warning (const char *, Lisp_Object);
  extern void init_obarray_once (void);
  extern void init_lread (void);

diff --cc src/lread.c
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/xfaces.c
Simple merge