Merge branch 'master' into xwidget

[gnu-emacs] / src / emacs.c

diff --git a/src/emacs.c b/src/emacs.c
index fdd17d1e062c511bf97862954cb2f70babee6a08..87b1f11d59b059079b4becf01b890fa749acf45d 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -65,6 +65,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "buffer.h"
 #include "window.h"
 
+#ifdef HAVE_XWIDGETS
+#include "xwidget.h"
+#endif
 #include "systty.h"
 #include "atimer.h"
 #include "blockinput.h"
@@ -1434,6 +1437,9 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
       syms_of_xfns ();
       syms_of_xmenu ();
       syms_of_fontset ();
+#ifdef HAVE_XWIDGETS
+      syms_of_xwidget();
+#endif
       syms_of_xsettings ();
 #ifdef HAVE_X_SM
       syms_of_xsmfns ();