diff options
| author | Kenichi Handa | 2014-07-05 23:07:57 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2014-07-05 23:07:57 +0900 |
| commit | aeb894a9a06d84d29b93ca04432d7cbed366e665 (patch) | |
| tree | e2b73f9a76bc826c7a443e9a8d4fb3b49bdf7332 /src/xfaces.c | |
| parent | 763a11d0d0dcf543e89a22c98f55ea07c40ceefa (diff) | |
| parent | a984543a4488ed08778eb775d62f7091db117945 (diff) | |
| download | emacs-aeb894a9a06d84d29b93ca04432d7cbed366e665.tar.gz emacs-aeb894a9a06d84d29b93ca04432d7cbed366e665.zip | |
merge trunk
Diffstat (limited to 'src/xfaces.c')
| -rw-r--r-- | src/xfaces.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index 4571137a249..ead14f0116d 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -676,19 +676,9 @@ init_frame_faces (struct frame *f) | |||
| 676 | } | 676 | } |
| 677 | #endif /* HAVE_WINDOW_SYSTEM */ | 677 | #endif /* HAVE_WINDOW_SYSTEM */ |
| 678 | 678 | ||
| 679 | /* Realize basic faces. Must have enough information in frame | 679 | /* Realize faces early (Bug#17889). */ |
| 680 | parameters to realize basic faces at this point. */ | 680 | if (!realize_basic_faces (f)) |
| 681 | #ifdef HAVE_X_WINDOWS | 681 | emacs_abort (); |
| 682 | if (!FRAME_X_P (f) || FRAME_X_WINDOW (f)) | ||
| 683 | #endif | ||
| 684 | #ifdef HAVE_NTGUI | ||
| 685 | if (!FRAME_WINDOW_P (f) || FRAME_W32_WINDOW (f)) | ||
| 686 | #endif | ||
| 687 | #ifdef HAVE_NS | ||
| 688 | if (!FRAME_NS_P (f) || FRAME_NS_WINDOW (f)) | ||
| 689 | #endif | ||
| 690 | if (!realize_basic_faces (f)) | ||
| 691 | emacs_abort (); | ||
| 692 | } | 682 | } |
| 693 | 683 | ||
| 694 | 684 | ||