From: Martin Rudalics Date: Sun, 31 Aug 2008 08:27:25 +0000 (+0000) Subject: (prepare_menu_bars): Don't call X-Git-Tag: emacs-pretest-23.0.90~3119 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23dc7615cdba5a0a4a8ac141b973e407966821c6;p=emacs.git (prepare_menu_bars): Don't call Vwindow_size_change_functions with arg Qt. --- 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;