diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-01-28 17:24:04 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-01-28 17:24:04 +0200 |
| commit | cd06d173a602bf0aa8a227ff1626dc70013fe480 (patch) | |
| tree | 054908e08e1f1adcc8aace9b10e872e05e592b6a /src/emacs.c | |
| parent | fa7a841124578c00872d8a5aa834f6bbe57400ff (diff) | |
| download | emacs-cd06d173a602bf0aa8a227ff1626dc70013fe480.tar.gz | |
Fix bug with face-id after restoring from pdump
* src/xfaces.c (init_xfaces): New function.
* src/emacs.c (main) [HAVE_PDUMPER]: If dumped with pdumper,
call init_xfaces. (Bug#34226)
* src/lisp.h (init_xfaces) [HAVE_PDUMPER]: Add prototype.
* test/lisp/faces-tests.el (faces--test-face-id): New test for
bug#34226.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index 2acee8e6fea..d6b8a87c723 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1484,6 +1484,11 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem running_asynch_code = 0; init_random (); +#ifdef HAVE_PDUMPER + if (dumped_with_pdumper_p ()) + init_xfaces (); +#endif + #if defined HAVE_JSON && !defined WINDOWSNT init_json (); #endif |