diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-14 16:32:27 +0200 |
commit | 220d91b834f7f7252b9953460422151b86b3520c (patch) | |
tree | 8f3e16983e83ac0da6beef346cb05cd2591a7f83 /src/w32term.c | |
parent | 31e96eecc09283b5169faf0d5dc1c8efd58539ac (diff) | |
parent | 9d4f32e88a1b642070f0adb41df04a0846c31970 (diff) | |
download | emacs-220d91b834f7f7252b9953460422151b86b3520c.tar.gz |
Merge changes from emacs-23 branch.
Diffstat (limited to 'src/w32term.c')
-rw-r--r-- | src/w32term.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/w32term.c b/src/w32term.c index a082aa32b69..1f53860de2e 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -893,7 +893,7 @@ w32_set_terminal_modes (struct terminal *term) { } -/* This is called when exiting or suspending Emacs. Exiting will make +/* This is called when exiting or suspending Emacs. Exiting will make the W32 windows go away, and suspending requires no action. */ static void @@ -4239,7 +4239,7 @@ w32_read_socket (struct terminal *terminal, int expected, inev.frame_or_window = window; } - last_window=window; + last_window = window; } if (!note_mouse_movement (f, &msg.msg)) help_echo_string = previous_help_echo_string; @@ -5601,7 +5601,7 @@ x_make_frame_visible (struct frame *f) /* Adjust vertical window position in order to avoid being covered by a task bar placed at the bottom of the desktop. */ SystemParametersInfo (SPI_GETWORKAREA, 0, &workarea_rect, 0); - GetWindowRect (FRAME_W32_WINDOW(f), &window_rect); + GetWindowRect (FRAME_W32_WINDOW (f), &window_rect); if (window_rect.bottom > workarea_rect.bottom && window_rect.top > workarea_rect.top) f->top_pos = max (window_rect.top |