[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 50090b0 2/2: Merge branch 'emacs-25' of git.savan
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 50090b0 2/2: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 |
Date: |
Mon, 23 Nov 2015 17:41:43 +0000 |
branch: emacs-25
commit 50090b04a6a1d5c0e0e42399d32b8a8b661a61d8
Merge: e5754f6 a574955
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25
---
src/frame.c | 2 --
src/window.c | 32 +-------------------------------
2 files changed, 1 insertions(+), 33 deletions(-)
diff --git a/src/frame.c b/src/frame.c
index 5bafc6e..c388986 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -518,7 +518,6 @@ adjust_frame_size (struct frame *f, int new_width, int
new_height, int inhibit,
if (new_windows_width != old_windows_width)
{
resize_frame_windows (f, new_windows_width, 1, 1);
- FRAME_WINDOW_SIZES_CHANGED (f) = true;
/* MSDOS frames cannot PRETEND, as they change frame size by
manipulating video hardware. */
@@ -544,7 +543,6 @@ adjust_frame_size (struct frame *f, int new_width, int
new_height, int inhibit,
|| WINDOW_TOP_PIXEL_EDGE (r) != FRAME_TOP_MARGIN_HEIGHT (f))
{
resize_frame_windows (f, new_windows_height, 0, 1);
- FRAME_WINDOW_SIZES_CHANGED (f) = true;
/* MSDOS frames cannot PRETEND, as they change frame size by
manipulating video hardware. */
diff --git a/src/window.c b/src/window.c
index 753c4ab..9f6b489 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4064,37 +4064,6 @@ resize_frame_windows (struct frame *f, int size, bool
horflag, bool pixelwise)
{
window_resize_apply (r, horflag);
window_pixel_to_total (r->frame, horflag ? Qt : Qnil);
-#if false /* Let's try without safe sizes and/or killing other windows. */
- }
- else
- {
- /* Finally, try with "safe" minimum sizes. */
- resize_root_window (root, delta, horflag ? Qt : Qnil, Qsafe,
- pixelwise ? Qt : Qnil);
- if (window_resize_check (r, horflag)
- && new_pixel_size == XINT (r->new_pixel))
- {
- window_resize_apply (r, horflag);
- window_pixel_to_total (r->frame, horflag ? Qt : Qnil);
- }
- else
- {
- /* We lost. Delete all windows but the frame's
- selected one. */
- root = f->selected_window;
- Fdelete_other_windows_internal (root, Qnil);
- if (horflag)
- {
- XWINDOW (root)->total_cols = new_size;
- XWINDOW (root)->pixel_width = new_pixel_size;
- }
- else
- {
- XWINDOW (root)->total_lines = new_size;
- XWINDOW (root)->pixel_height = new_pixel_size;
- }
- }
-#endif /* false */
}
}
}
@@ -4117,6 +4086,7 @@ resize_frame_windows (struct frame *f, int size, bool
horflag, bool pixelwise)
}
}
+ FRAME_WINDOW_SIZES_CHANGED (f) = true;
fset_redisplay (f);
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 50090b0 2/2: Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25,
Eli Zaretskii <=