aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2014-10-08 20:47:30 -0400
committerGlenn Morris2014-10-08 20:47:30 -0400
commit01058f734a96e6da949c200fb908f06ab8a74909 (patch)
tree86754bde01390f2e4078714e23eee32be7faec64 /src
parent285dc437722044fe106f48d202607e4373d795ee (diff)
downloademacs-01058f734a96e6da949c200fb908f06ab8a74909.tar.gz
emacs-01058f734a96e6da949c200fb908f06ab8a74909.zip
Doc tweaks
* doc/lispref/frames.texi (Multiple Terminals): Copyedits. * lisp/frame.el (display-monitor-attributes-list): Doc tweaks. * nt/README.W32, src/ChangeLog.10, src/w32term.c: Standardize on "taskbar" rather than "task bar", since that is what most references seem to use; e.g. http://en.wikipedia.org/wiki/Taskbar http://windows.microsoft.com/en-us/windows7/products/features/windows-taskbar
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog.102
-rw-r--r--src/w32term.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 19adb22b869..1b77eaf5803 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -3264,7 +3264,7 @@
3264 * w32term.c (x_make_frame_visible): Use SystemParametersInfo with 3264 * w32term.c (x_make_frame_visible): Use SystemParametersInfo with
3265 SPI_GETWORKAREA to find the dimensions of the screen work area, 3265 SPI_GETWORKAREA to find the dimensions of the screen work area,
3266 and adjust vertical position of the frame in order to avoid being 3266 and adjust vertical position of the frame in order to avoid being
3267 covered by the task bar. 3267 covered by the taskbar.
3268 3268
3269 * w32fns.c (w32_createwindow): Use CW_USEDEFAULT instead of 3269 * w32fns.c (w32_createwindow): Use CW_USEDEFAULT instead of
3270 f->left_pos and SH_SHOW instead of f->top_pos in the call to 3270 f->left_pos and SH_SHOW instead of f->top_pos in the call to
diff --git a/src/w32term.c b/src/w32term.c
index 5a053b4fc0d..66cdbfaecb0 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5959,7 +5959,7 @@ x_make_frame_visible (struct frame *f)
5959 RECT window_rect; 5959 RECT window_rect;
5960 5960
5961 /* Adjust vertical window position in order to avoid being 5961 /* Adjust vertical window position in order to avoid being
5962 covered by a task bar placed at the bottom of the desktop. */ 5962 covered by a taskbar placed at the bottom of the desktop. */
5963 SystemParametersInfo (SPI_GETWORKAREA, 0, &workarea_rect, 0); 5963 SystemParametersInfo (SPI_GETWORKAREA, 0, &workarea_rect, 0);
5964 GetWindowRect (FRAME_W32_WINDOW (f), &window_rect); 5964 GetWindowRect (FRAME_W32_WINDOW (f), &window_rect);
5965 if (window_rect.bottom > workarea_rect.bottom 5965 if (window_rect.bottom > workarea_rect.bottom