Commit aa636c84 authored by Eli Zaretskii's avatar Eli Zaretskii

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)
parent 016b3d58
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment