From 12f718579e6d438e9cb3916b8d64ff3801706550 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Mon, 9 Jun 2008 23:43:45 +0000 Subject: [PATCH] (x_make_frame_visible): Use alternate restore flags. --- src/ChangeLog | 2 ++ src/w32term.c | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index cb8b1f1f3ab..538f55d84dd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2008-06-09 Jason Rumney + * w32term.c (x_make_frame_visible): Use alternate restore flags. + * w32menu.c (Fx_popup_menu): Unwind protect while building menu. (parse_single_submenu): Remove. (digest_single_submenu): Remove. diff --git a/src/w32term.c b/src/w32term.c index a9bbbbe23fc..63d8a1518fe 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6377,8 +6377,15 @@ x_make_frame_visible (f) f->output_data.w32->asked_for_visible = 1; -/* my_show_window (f, FRAME_W32_WINDOW (f), f->async_iconified ? SW_RESTORE : SW_SHOW); */ - my_show_window (f, FRAME_W32_WINDOW (f), SW_SHOWNORMAL); + /* The first of these seems to give more expected behavior, but + was added as a commented out line in Sept 1997, with the + second version remaining uncommented. There may have been + some problem with it that led to it not being enabled, + so the old version remains commented out below in case we + decide we need to go back to it [23.0.60 2008-06-09]. */ + my_show_window (f, FRAME_W32_WINDOW (f), + f->async_iconified ? SW_RESTORE : SW_SHOW); + /* my_show_window (f, FRAME_W32_WINDOW (f), SW_SHOWNORMAL); */ } /* Synchronize to ensure Emacs knows the frame is visible -- 2.39.2