diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-08-13 12:22:07 +0200 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-08-13 12:22:07 +0200 |
| commit | 46e7613ad3b88807d25cfab3d78bf46c9e2fe13e (patch) | |
| tree | a7b560c36e097660536697c9d0057c9273d779b2 /src/emacs.c | |
| parent | f6502f959253b8f705e324e137c2933c5a668f62 (diff) | |
| parent | e9eafd22681b8e95d8d642def0512d9290564206 (diff) | |
| download | emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.tar.gz emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.tar.bz2 emacs-46e7613ad3b88807d25cfab3d78bf46c9e2fe13e.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c index 8c252276352..288ddb47bd7 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1551,6 +1551,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem if (!initialized) { init_alloc_once (); + init_pdumper_once (); init_obarray_once (); init_eval_once (); init_charset_once (); @@ -1877,7 +1878,6 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem syms_of_xfns (); syms_of_xmenu (); syms_of_fontset (); - syms_of_xwidget (); syms_of_xsettings (); #ifdef HAVE_X_SM syms_of_xsmfns (); @@ -1954,6 +1954,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem #endif /* HAVE_W32NOTIFY */ #endif /* WINDOWSNT */ + syms_of_xwidget (); syms_of_threads (); syms_of_profiler (); syms_of_pdumper (); |