aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-03-15 12:07:29 +0200
committerEli Zaretskii2013-03-15 12:07:29 +0200
commit5f795e34b35eb1c9374d41a784c654e6451d3670 (patch)
tree9e3286b1d643e4713033b1166a1e3b47e26cd1c7
parent4e2df81da54e2b703dc4027edfc54e28788d72f3 (diff)
downloademacs-5f795e34b35eb1c9374d41a784c654e6451d3670.tar.gz
emacs-5f795e34b35eb1c9374d41a784c654e6451d3670.zip
Match the effect of FULLSCREEN_BOTH and FULLSCREEN_MAXIMIZED to docs on Windows.
src/w32term.c (w32fullscreen_hook): Swap FULLSCREEN_BOTH and FULLSCREEN_MAXIMIZED. Fixes: debbugs:13935
-rw-r--r--doc/lispref/frames.texi5
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w32term.c4
3 files changed, 10 insertions, 4 deletions
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 7d56d38ffad..01d2d1d6c45 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -632,8 +632,9 @@ possible. The value @code{fullboth} specifies that both the width and
632the height shall be set to the size of the screen. The value 632the height shall be set to the size of the screen. The value
633@code{maximized} specifies that the frame shall be maximized. The 633@code{maximized} specifies that the frame shall be maximized. The
634difference between @code{maximized} and @code{fullboth} is that the 634difference between @code{maximized} and @code{fullboth} is that the
635former still has window manager decorations while the latter really 635former can still be resized by dragging window manager decorations
636covers the whole screen. 636with the mouse, while the latter really covers the whole screen and
637does not allow resizing by mouse dragging.
637@end table 638@end table
638 639
639@node Layout Parameters 640@node Layout Parameters
diff --git a/src/ChangeLog b/src/ChangeLog
index ccbe9bcd24a..147139279ba 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-03-15 Eli Zaretskii <eliz@gnu.org>
2
3 * w32term.c (w32fullscreen_hook): Swap FULLSCREEN_BOTH and
4 FULLSCREEN_MAXIMIZED. (Bug#13935)
5
12013-03-15 Dmitry Antipov <dmantipov@yandex.ru> 62013-03-15 Dmitry Antipov <dmantipov@yandex.ru>
2 7
3 * region-cache.c (find_cache_boundary, move_cache_gap) 8 * region-cache.c (find_cache_boundary, move_cache_gap)
diff --git a/src/w32term.c b/src/w32term.c
index 6b51777839f..989ceb0f847 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -5682,10 +5682,10 @@ w32fullscreen_hook (FRAME_PTR f)
5682 5682
5683 switch (f->want_fullscreen) 5683 switch (f->want_fullscreen)
5684 { 5684 {
5685 case FULLSCREEN_MAXIMIZED: 5685 case FULLSCREEN_BOTH:
5686 PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MAXIMIZE, 0); 5686 PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MAXIMIZE, 0);
5687 break; 5687 break;
5688 case FULLSCREEN_BOTH: 5688 case FULLSCREEN_MAXIMIZED:
5689 height = 5689 height =
5690 FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height) 5690 FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height)
5691 - XINT (Ftool_bar_lines_needed (selected_frame)) 5691 - XINT (Ftool_bar_lines_needed (selected_frame))