diff options
| author | Martin Rudalics | 2008-08-31 08:27:25 +0000 |
|---|---|---|
| committer | Martin Rudalics | 2008-08-31 08:27:25 +0000 |
| commit | 23dc7615cdba5a0a4a8ac141b973e407966821c6 (patch) | |
| tree | b94d32ec10cf8e06f4f99d4e3c34f17121a9bda0 /src | |
| parent | 97431b7f7aef32ca1b28bb3f0f99f5c6059993e0 (diff) | |
| download | emacs-23dc7615cdba5a0a4a8ac141b973e407966821c6.tar.gz emacs-23dc7615cdba5a0a4a8ac141b973e407966821c6.zip | |
(prepare_menu_bars): Don't call
Vwindow_size_change_functions with arg Qt.
Diffstat (limited to 'src')
| -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) | |||
| 5920 | { | 5920 | { |
| 5921 | /* Automatic composition with glyph-string. */ | 5921 | /* Automatic composition with glyph-string. */ |
| 5922 | Lisp_Object gstring = composition_gstring_from_id (it->cmp_it.id); | 5922 | Lisp_Object gstring = composition_gstring_from_id (it->cmp_it.id); |
| 5923 | 5923 | ||
| 5924 | it->face_id = face_for_font (it->f, LGSTRING_FONT (gstring), face); | 5924 | it->face_id = face_for_font (it->f, LGSTRING_FONT (gstring), face); |
| 5925 | } | 5925 | } |
| 5926 | else | 5926 | else |
| @@ -9523,7 +9523,8 @@ prepare_menu_bars () | |||
| 9523 | 9523 | ||
| 9524 | while (CONSP (functions)) | 9524 | while (CONSP (functions)) |
| 9525 | { | 9525 | { |
| 9526 | call1 (XCAR (functions), frame); | 9526 | if (!EQ (XCAR (functions), Qt)) |
| 9527 | call1 (XCAR (functions), frame); | ||
| 9527 | functions = XCDR (functions); | 9528 | functions = XCDR (functions); |
| 9528 | } | 9529 | } |
| 9529 | UNGCPRO; | 9530 | UNGCPRO; |