diff options
| author | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
| commit | e3060a0c4d2f418ac786775109d71e5843ccf42e (patch) | |
| tree | 347b37fc39d0db9cd23b3e9f79ee81b4bbc40f08 /src/ChangeLog.10 | |
| parent | 1a3eca0656bdb764200e10a4f264138e94b1f3ce (diff) | |
| parent | 980d78b3587560c13a46aef352ed8d5ed744acf6 (diff) | |
| download | emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.tar.gz emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/ChangeLog.10')
| -rw-r--r-- | src/ChangeLog.10 | 2 |
1 files changed, 1 insertions, 1 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 |