diff options
| author | Martin Rudalics <rudalics@gmx.at> | 2008-08-31 08:27:25 +0000 |
|---|---|---|
| committer | Martin Rudalics <rudalics@gmx.at> | 2008-08-31 08:27:25 +0000 |
| commit | 23dc7615cdba5a0a4a8ac141b973e407966821c6 (patch) | |
| tree | b94d32ec10cf8e06f4f99d4e3c34f17121a9bda0 /src/xdisp.c | |
| parent | 97431b7f7aef32ca1b28bb3f0f99f5c6059993e0 (diff) | |
| download | emacs-23dc7615cdba5a0a4a8ac141b973e407966821c6.tar.gz | |
(prepare_menu_bars): Don't call
Vwindow_size_change_functions with arg Qt.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index 3f73391c0aa..9e351b5c47d 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -5920,7 +5920,7 @@ get_next_display_element (it) { /* Automatic composition with glyph-string. */ Lisp_Object gstring = composition_gstring_from_id (it->cmp_it.id); - + it->face_id = face_for_font (it->f, LGSTRING_FONT (gstring), face); } else @@ -9523,7 +9523,8 @@ prepare_menu_bars () while (CONSP (functions)) { - call1 (XCAR (functions), frame); + if (!EQ (XCAR (functions), Qt)) + call1 (XCAR (functions), frame); functions = XCDR (functions); } UNGCPRO; |