Re: Missing changes in merges from emacs-25 to master

[martin rudalics <rudalics@gmx.at>]

 > Most probably that git version is too old to support the ^2 syntax.

That's what I suspected initially but it turned out that I was just too
sloppy when reading the error message.

 > diff --git a/src/window.c b/src/window.c
 > index 9e065ea..70b7e58 100644
 > --- a/src/window.c
 > +++ b/src/window.c
 > @@ -3971,11 +3971,9 @@ values.  */)
 >   }
 >
 >
 > -/* 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.  */
 > +/* 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.  */
 >   void
 >   resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
 >   {
 > @@ -4076,7 +4074,7 @@ resize_frame_windows (struct frame *f, int size, bool horflag, bool pixelwise)
 >         m = XWINDOW (mini);
 >         if (horflag)
 >          {
 > -         m->total_cols = new_size;
 > +         m->total_cols = size;
 >            m->pixel_width = new_pixel_size;
 >          }
 >         else
 >
 >
 >

Exactly what I was looking for and what I now get here as well ;-)

Thanks, martin