Mercurial > emacs
changeset 102628:94c85c1ce9d8
(xdialog_show): Move Fredisplay call ...
(Fx_popup_dialog): ... here.
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
|---|---|
| date | Wed, 18 Mar 2009 08:37:33 +0000 |
| parents | 808068e31116 |
| children | ece04107d749 |
| files | src/xmenu.c |
| diffstat | 1 files changed, 11 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xmenu.c Wed Mar 18 07:29:56 2009 +0000 +++ b/src/xmenu.c Wed Mar 18 08:37:33 2009 +0000 @@ -604,6 +604,17 @@ if (! FRAME_X_P (f) && ! FRAME_MSDOS_P (f)) error ("Can not put X dialog on this terminal"); + /* Force a redisplay before showing the dialog. If a frame is created + just before showing the dialog, its contents may not have been fully + drawn, as this depends on timing of events from the X server. Redisplay + is not done when a dialog is shown. If redisplay could be done in the + X event loop (i.e. the X event loop does not run in a signal handler) + this would not be needed. + + Do this before creating the widget value that points to Lisp + string contents, because Fredisplay may GC and relocate them. */ + Fredisplay (Qt); + #if ! defined (USE_X_TOOLKIT) && ! defined (USE_GTK) /* Display a menu with these alternatives in the middle of frame F. */ @@ -2448,14 +2459,6 @@ /* No selection has been chosen yet. */ menu_item_selection = 0; - /* Force a redisplay before showing the dialog. If a frame is created - just before showing the dialog, its contents may not have been fully - drawn, as this depends on timing of events from the X server. Redisplay - is not done when a dialog is shown. If redisplay could be done in the - X event loop (i.e. the X event loop does not run in a signal handler) - this would not be needed. */ - Fredisplay (Qt); - /* Actually create and show the dialog. */ create_and_show_dialog (f, first_wv);