From: Gerd Möllmann <gerd@gnu.org>
Date: Mon, 7 Aug 2023 07:40:11 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into scratch/pkg
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=075dfe91c12c9f1b3e3406078a087e271f94eecf;p=emacs.git

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

075dfe91c12c9f1b3e3406078a087e271f94eecf
diff --cc .gitignore
index e3a628eecb8,889008dd96d..b1bf157cb3d
--- a/.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 src/lisp.h
index 90bbdde073e,447912581d7..115796bf926
--- a/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);