diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2010-03-20 12:37:39 +0900 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2010-03-20 12:37:39 +0900 |
| commit | ad13a3ee9b9f4ee81b19c6c02da8cc338901304e (patch) | |
| tree | f4da8f93997aa920bbd33965eb8e47e5cac064d6 /src | |
| parent | 8eae7a421b7c6a2bd010e9f9f580febe04373ccd (diff) | |
| download | emacs-ad13a3ee9b9f4ee81b19c6c02da8cc338901304e.tar.gz | |
xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around XLoadQueryFont.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xfns.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2f237de6b93..cf9d0fd9bea 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-03-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> + + * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around + XLoadQueryFont. + 2010-03-16 Kenichi Handa <handa@m17n.org> * coding.c (decode_coding_ccl): Fix previous change for the diff --git a/src/xfns.c b/src/xfns.c index 96fb090e327..b11a7a5e91a 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -3347,7 +3347,9 @@ This function is an internal primitive--use `make-frame' instead. */) #ifdef USE_LUCID /* Prevent lwlib/xlwmenu.c from crashing because of a bug whereby it fails to get any font. */ + BLOCK_INPUT; xlwmenu_default_font = XLoadQueryFont (FRAME_X_DISPLAY (f), "fixed"); + UNBLOCK_INPUT; #endif /* Frame contents get displaced if an embedded X window has a border. */ |