aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2010-03-20 12:37:39 +0900
committerYAMAMOTO Mitsuharu2010-03-20 12:37:39 +0900
commitad13a3ee9b9f4ee81b19c6c02da8cc338901304e (patch)
treef4da8f93997aa920bbd33965eb8e47e5cac064d6 /src
parent8eae7a421b7c6a2bd010e9f9f580febe04373ccd (diff)
downloademacs-ad13a3ee9b9f4ee81b19c6c02da8cc338901304e.tar.gz
emacs-ad13a3ee9b9f4ee81b19c6c02da8cc338901304e.zip
xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around XLoadQueryFont.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xfns.c2
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 @@
12010-03-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
2
3 * xfns.c (Fx_create_frame) [USE_LUCID]: Add BLOCK_INPUT around
4 XLoadQueryFont.
5
12010-03-16 Kenichi Handa <handa@m17n.org> 62010-03-16 Kenichi Handa <handa@m17n.org>
2 7
3 * coding.c (decode_coding_ccl): Fix previous change for the 8 * 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. */)
3347#ifdef USE_LUCID 3347#ifdef USE_LUCID
3348 /* Prevent lwlib/xlwmenu.c from crashing because of a bug 3348 /* Prevent lwlib/xlwmenu.c from crashing because of a bug
3349 whereby it fails to get any font. */ 3349 whereby it fails to get any font. */
3350 BLOCK_INPUT;
3350 xlwmenu_default_font = XLoadQueryFont (FRAME_X_DISPLAY (f), "fixed"); 3351 xlwmenu_default_font = XLoadQueryFont (FRAME_X_DISPLAY (f), "fixed");
3352 UNBLOCK_INPUT;
3351#endif 3353#endif
3352 3354
3353 /* Frame contents get displaced if an embedded X window has a border. */ 3355 /* Frame contents get displaced if an embedded X window has a border. */