From: Andrea Corallo <akrl@sdf.org>
Date: Fri, 8 Jan 2021 20:40:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'savannah/master' into HEAD
X-Git-Tag: emacs-28.0.90~2727^2~174
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=400f620f24b90540f71673a998c41327237330be;p=emacs.git

Merge remote-tracking branch 'savannah/master' into HEAD
---

400f620f24b90540f71673a998c41327237330be
diff --cc src/emacs.c
index 5d9317ada17,69d10821fae..738ef12c98c
--- a/src/emacs.c
+++ b/src/emacs.c
@@@ -1984,17 -1956,7 +1984,12 @@@ Using an Emacs configured with --with-x
        syms_of_json ();
  #endif
  
-       keys_of_casefiddle ();
-       keys_of_cmds ();
-       keys_of_buffer ();
        keys_of_keyboard ();
-       keys_of_keymap ();
-       keys_of_window ();
 +
 +#ifdef HAVE_NATIVE_COMP
 +      /* Must be after the last defsubr has run.  */
 +      hash_native_abi ();
 +#endif
      }
    else
      {