[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 aa636c8: Fix crashes when mini-window has non-zer
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-25 aa636c8: Fix crashes when mini-window has non-zero margins |
Date: |
Fri, 15 Jan 2016 15:09:09 +0000 |
branch: emacs-25
commit aa636c8465b03c09249dccd68fca3d1df04eaa2c
Author: Eli Zaretskii <address@hidden>
Commit: Eli Zaretskii <address@hidden>
Fix crashes when mini-window has non-zero margins
* src/window.c (resize_frame_windows): Use 'new_size' to set
minibuffer window's 'total_cols' value, as 'size' might be in
pixels. (Bug#22356)
---
src/window.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/window.c b/src/window.c
index bb414e7..bbe47c7 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3970,9 +3970,11 @@ values. */)
}
-/* Resize frame F's windows when number of lines of F is set to SIZE.
- HORFLAG means resize windows when number of columns of F is set to
- SIZE. PIXELWISE means to interpret SIZE as pixels. */
+/* Resize frame F's windows when F's width or height is set to SIZE.
+ If HORFLAG is zero, F's width was set to SIZE, otherwise its height
+ was set. SIZE is interpreted in F's canonical character units
+ (a.k.a. "columns" or "lines"), unless PIXELWISE is non-zero, which
+ means to interpret SIZE in pixel units. */
void
resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
{
@@ -4073,7 +4075,7 @@ resize_frame_windows (struct frame *f, int size, bool
horflag, bool pixelwise)
m = XWINDOW (mini);
if (horflag)
{
- m->total_cols = size;
+ m->total_cols = new_size;
m->pixel_width = new_pixel_size;
}
else
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 aa636c8: Fix crashes when mini-window has non-zero margins,
Eli Zaretskii <=