Mercurial > emacs
changeset 97894:587fdfd5e2b9
(prepare_menu_bars): Don't call
Vwindow_size_change_functions with arg Qt.
author | Martin Rudalics <rudalics@gmx.at> |
---|---|
date | Sun, 31 Aug 2008 08:27:25 +0000 |
parents | 3744f8613c08 |
children | f0990323fce1 |
files | src/xdisp.c |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xdisp.c Sun Aug 31 02:13:38 2008 +0000 +++ b/src/xdisp.c Sun Aug 31 08:27:25 2008 +0000 @@ -5920,7 +5920,7 @@ { /* 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 @@ while (CONSP (functions)) { - call1 (XCAR (functions), frame); + if (!EQ (XCAR (functions), Qt)) + call1 (XCAR (functions), frame); functions = XCDR (functions); } UNGCPRO;