aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Rudalics2016-03-20 16:52:39 +0100
committerMartin Rudalics2016-03-20 16:52:39 +0100
commit5283593ced29a2c98e4af3607a68ee7a6d10fcac (patch)
tree6c84098dcbd3dea48f8825a0b2095a222b4116f2 /src
parent68f13422042d086b6210a66282169a2dd0974ea3 (diff)
downloademacs-5283593ced29a2c98e4af3607a68ee7a6d10fcac.tar.gz
emacs-5283593ced29a2c98e4af3607a68ee7a6d10fcac.zip
Resurrect earlier fix of resize_frame_windows
* src/window.c (resize_frame_windows): Resurrect earlier fix for calculating the number of columns of the minibuffer window which was lost in subsequent merges.
Diffstat (limited to 'src')
-rw-r--r--src/window.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/window.c b/src/window.c
index 3cfb6fce239..77a43b739ce 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4064,9 +4064,11 @@ values. */)
4064} 4064}
4065 4065
4066 4066
4067/* Resize frame F's windows when number of lines of F is set to SIZE. 4067/* Resize frame F's windows when F's width or height is set to SIZE.
4068 HORFLAG means resize windows when number of columns of F is set to 4068 If HORFLAG is zero, F's width was set to SIZE, otherwise its height
4069 SIZE. PIXELWISE means to interpret SIZE as pixels. */ 4069 was set. SIZE is interpreted in F's canonical character units
4070 (a.k.a. "columns" or "lines"), unless PIXELWISE is non-zero, which
4071 means to interpret SIZE in pixel units. */
4070void 4072void
4071resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise) 4073resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
4072{ 4074{
@@ -4167,7 +4169,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
4167 m = XWINDOW (mini); 4169 m = XWINDOW (mini);
4168 if (horflag) 4170 if (horflag)
4169 { 4171 {
4170 m->total_cols = size; 4172 m->total_cols = new_size;
4171 m->pixel_width = new_pixel_size; 4173 m->pixel_width = new_pixel_size;
4172 } 4174 }
4173 else 4175 else