From: Gerd Möllmann <gerd@gnu.org>
Date: Sat, 29 Oct 2022 12:10:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into feature/pkg
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9b7f39026f61ee97406069ebd9a10f6f2dd2fcf5;p=emacs.git

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

9b7f39026f61ee97406069ebd9a10f6f2dd2fcf5
diff --cc lisp/loadup.el
index 02b4cc6e55f,2a9aff4c1fe..c690bb0cb65
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@@ -363,9 -363,14 +363,14 @@@
  (load "electric")
  (load "paren")
  
 -(load "emacs-lisp/shorthands")
 +;(load "emacs-lisp/shorthands")
  
  (load "emacs-lisp/eldoc")
+ (load "emacs-lisp/cconv")
+ (when (and (compiled-function-p (symbol-function 'cconv-fv))
+            (compiled-function-p (symbol-function 'macroexpand-all)))
+   (setq internal-make-interpreted-closure-function
+         #'cconv-make-interpreted-closure))
  (load "cus-start") ;Late to reduce customize-rogue (needs loaddefs.el anyway)
  (if (not (eq system-type 'ms-dos))
      (load "tooltip"))
diff --cc src/Makefile.in
index 5f6ebbb67e4,059e6c717b4..0ccda632846
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@@ -426,25 -426,26 +426,27 @@@ ALL_CXX_CFLAGS = $(EMACS_CFLAGS) 
  
  ## lastfile must follow all files whose initialized data areas should
  ## be dumped as pure by dump-emacs.
- base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o \
- 	charset.o coding.o category.o ccl.o character.o chartab.o bidi.o \
- 	$(CM_OBJ) term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ) \
- 	emacs.o keyboard.o macros.o keymap.o sysdep.o \
- 	bignum.o buffer.o filelock.o insdel.o marker.o \
- 	minibuf.o fileio.o dired.o \
- 	cmds.o casetab.o casefiddle.o indent.o search.o regex-emacs.o undo.o \
- 	alloc.o pdumper.o data.o doc.o editfns.o callint.o \
- 	eval.o floatfns.o fns.o sort.o font.o print.o lread.o $(MODULES_OBJ) \
- 	syntax.o $(UNEXEC_OBJ) bytecode.o comp.o $(DYNLIB_OBJ) \
- 	pkg.o process.o gnutls.o callproc.o \
- 	region-cache.o sound.o timefns.o atimer.o \
+ base_obj = dispnew.o frame.o scroll.o xdisp.o menu.o $(XMENU_OBJ) window.o     \
+ 	charset.o coding.o category.o ccl.o character.o chartab.o bidi.o       \
+ 	$(CM_OBJ) term.o terminal.o xfaces.o $(XOBJ) $(GTK_OBJ) $(DBUS_OBJ)    \
+ 	emacs.o keyboard.o macros.o keymap.o sysdep.o 			       \
+ 	bignum.o buffer.o filelock.o insdel.o marker.o 			       \
+ 	minibuf.o fileio.o dired.o 					       \
+ 	cmds.o casetab.o casefiddle.o indent.o search.o regex-emacs.o undo.o   \
+ 	alloc.o pdumper.o data.o doc.o editfns.o callint.o 		       \
+ 	eval.o floatfns.o fns.o sort.o font.o print.o lread.o $(MODULES_OBJ)   \
+ 	syntax.o $(UNEXEC_OBJ) bytecode.o comp.o $(DYNLIB_OBJ) 		       \
+ 	process.o gnutls.o callproc.o 					       \
+ 	region-cache.o sound.o timefns.o atimer.o 			       \
  	doprnt.o intervals.o textprop.o composite.o xml.o lcms.o $(NOTIFY_OBJ) \
- 	$(XWIDGETS_OBJ) \
- 	profiler.o decompress.o \
- 	thread.o systhread.o sqlite.o \
- 	$(if $(HYBRID_MALLOC),sheap.o) \
- 	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ) \
- 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ) \
+ 	$(XWIDGETS_OBJ) 						       \
+ 	profiler.o decompress.o 					       \
+ 	thread.o systhread.o sqlite.o 					       \
++	pkg.o								       \
+ 	itree.o 							       \
+ 	$(if $(HYBRID_MALLOC),sheap.o) 					       \
+ 	$(MSDOS_OBJ) $(MSDOS_X_OBJ) $(NS_OBJ) $(CYGWIN_OBJ) $(FONT_OBJ)        \
+ 	$(W32_OBJ) $(WINDOW_SYSTEM_OBJ) $(XGSELOBJ) $(JSON_OBJ) 	       \
  	$(HAIKU_OBJ) $(PGTK_OBJ)
  doc_obj = $(base_obj) $(NS_OBJC_OBJ)
  obj = $(doc_obj) $(HAIKU_CXX_OBJ)