aboutsummaryrefslogtreecommitdiffstats
path: root/src/w32term.c
diff options
context:
space:
mode:
authorJoakim Verona2011-11-22 15:46:22 +0100
committerJoakim Verona2011-11-22 15:46:22 +0100
commita9c1e05adddf6011c61c0df582c5f2ed423f35c8 (patch)
tree489fac119296416ba2f3530fd3bcb70efbbbdaa6 /src/w32term.c
parent40bb789236e486a3f36eefb2840c293369ce2af3 (diff)
parentb5afc20930c91159a1cbf629bcaa7e251653dc74 (diff)
downloademacs-a9c1e05adddf6011c61c0df582c5f2ed423f35c8.tar.gz
emacs-a9c1e05adddf6011c61c0df582c5f2ed423f35c8.zip
upstream
Diffstat (limited to 'src/w32term.c')
-rw-r--r--src/w32term.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/w32term.c b/src/w32term.c
index e9fa16ba325..a2ccdd21f7d 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4506,7 +4506,7 @@ w32_read_socket (struct terminal *terminal, int expected,
4506 } 4506 }
4507 4507
4508 /* If window has been obscured or exposed by another window 4508 /* If window has been obscured or exposed by another window
4509 being maximised or minimised/restored, then recheck 4509 being maximized or minimized/restored, then recheck
4510 visibility of all frames. Direct changes to our own 4510 visibility of all frames. Direct changes to our own
4511 windows get handled by WM_SIZE. */ 4511 windows get handled by WM_SIZE. */
4512#if 0 4512#if 0
@@ -5576,7 +5576,7 @@ x_raise_frame (struct frame *f)
5576 input focus anyway (so the window with focus will never be 5576 input focus anyway (so the window with focus will never be
5577 completely obscured) - if not, then just moving the mouse over it 5577 completely obscured) - if not, then just moving the mouse over it
5578 is sufficient to give it focus. On Windows, the user must actually 5578 is sufficient to give it focus. On Windows, the user must actually
5579 click on the frame (preferrably the title bar so as not to move 5579 click on the frame (preferably the title bar so as not to move
5580 point), which is more awkward. Also, no other Windows program 5580 point), which is more awkward. Also, no other Windows program
5581 raises a window to the top but leaves another window (possibly now 5581 raises a window to the top but leaves another window (possibly now
5582 completely obscured) with input focus. 5582 completely obscured) with input focus.
@@ -5692,10 +5692,10 @@ x_make_frame_visible (struct frame *f)
5692 5692
5693 /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL 5693 /* According to a report in emacs-devel 2008-06-03, SW_SHOWNORMAL
5694 causes unexpected behavior when unminimizing frames that were 5694 causes unexpected behavior when unminimizing frames that were
5695 previously maximised. But only SW_SHOWNORMAL works properly for 5695 previously maximized. But only SW_SHOWNORMAL works properly for
5696 frames that were truely hidden (using make-frame-invisible), so 5696 frames that were truely hidden (using make-frame-invisible), so
5697 we need it to avoid Bug#5482. It seems that async_iconified 5697 we need it to avoid Bug#5482. It seems that async_iconified
5698 is only set for minimised windows that are still visible, so 5698 is only set for minimized windows that are still visible, so
5699 use that to determine the appropriate flag to pass ShowWindow. */ 5699 use that to determine the appropriate flag to pass ShowWindow. */
5700 my_show_window (f, FRAME_W32_WINDOW (f), 5700 my_show_window (f, FRAME_W32_WINDOW (f),
5701 f->async_iconified ? SW_RESTORE : SW_SHOWNORMAL); 5701 f->async_iconified ? SW_RESTORE : SW_SHOWNORMAL);
@@ -6164,7 +6164,7 @@ w32_term_init (Lisp_Object display_name, char *xrm_option, char *resource_name)
6164 dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE; 6164 dpyinfo->has_palette = GetDeviceCaps (hdc, RASTERCAPS) & RC_PALETTE;
6165 ReleaseDC (NULL, hdc); 6165 ReleaseDC (NULL, hdc);
6166 6166
6167 /* initialise palette with white and black */ 6167 /* initialize palette with white and black */
6168 { 6168 {
6169 XColor color; 6169 XColor color;
6170 w32_defined_color (0, "white", &color, 1); 6170 w32_defined_color (0, "white", &color, 1);