mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-14 15:30:29 -08:00
Code Issues Projects Releases Wiki Activity

Fix crashes when mini-window has non-zero margins

Browse source 
* 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)
This commit is contained in:
Eli Zaretskii 2016-01-15 17:07:38 +02:00
parent 016b3d5894
commit aa636c8465
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/window.c
View file

@ -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