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

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

diff --cc lisp/loadup.el
index 02b4cc6e55ff89e8baa6bd0e03453eb883ffa105,2a9aff4c1fea746d620cfd15faf713a937c74bb5..c690bb0cb65b91a25a28efd57ebad6c8d2c87efd
--- 1/lisp/loadup.el
--- 2/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 lisp/minibuffer.el
Simple merge

diff --cc src/Makefile.in
index 5f6ebbb67e4d8a4eb83b7f38c7b38d5a30f1d4c7,059e6c717b45a60a786b0fb8f5609cc06a7ebb2b..0ccda6328469b1a1a63eacfd0c6989775bfc9847
--- 1/src/Makefile.in
--- 2/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)

diff --cc src/alloc.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/lisp.h
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc test/src/emacs-module-tests.el
Simple merge