Missing changes in merges from emacs-25 to master

[martin rudalics]

Hi, Paul and friends

Something in these commits seems to have made earlier changes to master
reverted:


commit cb4e054e41cdb7e398351a5ae8224759e721349e
Merge: e6d5753 6090275
Author: Paul Eggert <address@hidden>
Date:   Sat Jan 30 11:43:26 2016 -0800

    -

commit 2b41d6a979b0ea361e078891b8763b4ae7be8092
Merge: fe9c8b6 71468e0
Author: Paul Eggert <address@hidden>
Date:   Sat Jan 30 11:28:37 2016 -0800

    -

commit 82b089783e71b2aeef950eaecfe4cbc0735e64a2
Merge: d27c807 f7dc6d8
Author: Paul Eggert <address@hidden>
Date:   Sat Jan 30 11:27:34 2016 -0800

    -


In particular, in commit aa636c8465b03c09249dccd68fca3d1df04eaa2c Eli
fixed a bug in window.c by writing

          m->total_cols = new_size;

instead of the earlier

          m->total_cols = size;

IIUC after commit 82b089783e71b2aeef950eaecfe4cbc0735e64a2 the earlier
line reappeared.

Can you please have a look?  I somehow have the feeling that more such
issues might have occurred but I can easily be wrong.  Worse even, I
could have introduced such a bug myself in one of my later commits but
don't see any evidence so far :-(

Thanks, martin