From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: martin rudalics Newsgroups: gmane.emacs.devel Subject: Missing changes in merges from emacs-25 to master Date: Sun, 20 Mar 2016 12:36:07 +0100 Message-ID: <56EE8B27.3090208@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1458473818 25220 80.91.229.3 (20 Mar 2016 11:36:58 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 20 Mar 2016 11:36:58 +0000 (UTC) Cc: emacs-devel To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 20 12:36:43 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ahbey-0004LR-Br for ged-emacs-devel@m.gmane.org; Sun, 20 Mar 2016 12:36:40 +0100 Original-Received: from localhost ([::1]:52418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahbex-0006Jo-17 for ged-emacs-devel@m.gmane.org; Sun, 20 Mar 2016 07:36:39 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahbek-0006Jg-GA for emacs-devel@gnu.org; Sun, 20 Mar 2016 07:36:27 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahbeh-0004HV-Bl for emacs-devel@gnu.org; Sun, 20 Mar 2016 07:36:26 -0400 Original-Received: from mout.gmx.net ([212.227.17.22]:65298) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahbeh-0004HP-2T for emacs-devel@gnu.org; Sun, 20 Mar 2016 07:36:23 -0400 Original-Received: from [192.168.1.100] ([212.95.7.95]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0MhMg2-1aTwQC2geA-00MeDc; Sun, 20 Mar 2016 12:36:10 +0100 X-Provags-ID: V03:K0:+yNAGuTWmUghttSF0HubLYigjNBocHtMEWw+EtgAN54hWfrbSnZ uwggEQtj37K5SfxZcc1un/GijZ45JCU2emYmG6eFeVXNQzWphB+qMcWsOTgu39JxF4ErmOv Rbu/ChNIAvOwRXhFFDBIHailHnsz+a+JlKoe1WhadD5vOhje4mBKtNWuEJ85R2F/LkQsD1m sUxoGsgXMQUfK51814vSA== X-UI-Out-Filterresults: notjunk:1;V01:K0:O99Sp50AH4c=:zO3xRqmdZljx3IbER5aj70 bvOsX6BNq82ks8/hVm9t05vPZor2RwVi3QCx/6BmHXux0wuQ3dUpTXQsTRgvxXd8zwYfpzFrL 3Gz7ePUgzoSh7ejxivs1BYqPtQc8lMAmEB2pyY/b7eSMyWV/uy7bEi5PMmlzYyfyGCjAY3AuM P8tUCxkQAr/Se831VvioGgRzSaX98ok3K3bfVGBwW6xJ1/IBw86aBFuq0DC9hkvaZ4XmkKUk4 X75M6Mrgxr1nIhqO4EpDYpxg2EaXuETtHjEjV08cN9yvdX2CqnwkfEufxZvQXiBEcfnzU735I ZimlYHcKnTehiuQsqmeJP/8XpVRPeDEEKoFa/ymaeLNHPnKt3I9v4yILNNVev0tX2LR8wNuMR Uw0mlf1vif+vIDHYsYi4CZKZbDCnw/eY0Prxn/N6gcTf0+M7PUFLF8DDHRpbixHaRWEk1W8N1 FgnHf9Jl5LuuXJ2r1pkVLPEpV3gMLwDbzBOhwhnkCZZHaqFQVkbumNuSlp9IdSyM9jTNbSJgy 3rd76LG8nrFKx/UIDex7qZkp86wk/wKApiVd67xXeP/bPnIr1x8d/WWfZE6VyZIWhX5+jWyp9 ETx/8JU7BuJoBexH0BNpltZuehkbABfZwWAOlnIa35PDX01E1Iftrlv82nsyZg+D8ZpjQwDkj yzTGilJHFEwWZFRQnIwMD9WO2S4wgkOlD1hLdP+5wIPMp0xsxGRip3ietIOBbQzTYk5M4EwZB gxUx61NAs5DQI3XKW+WwEuuRTySgdskjtkFpCPq2hWcley8316y0TT3RUqmBIgTfdUnVvAae X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.22 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:201923 Archived-At: 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 Date: Sat Jan 30 11:43:26 2016 -0800 - commit 2b41d6a979b0ea361e078891b8763b4ae7be8092 Merge: fe9c8b6 71468e0 Author: Paul Eggert Date: Sat Jan 30 11:28:37 2016 -0800 - commit 82b089783e71b2aeef950eaecfe4cbc0735e64a2 Merge: d27c807 f7dc6d8 Author: Paul Eggert 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