From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Sun, 20 Mar 2016 20:50:41 +0200 Message-ID: <8360wh6l1a.fsf@gnu.org> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458499893 18101 80.91.229.3 (20 Mar 2016 18:51:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 20 Mar 2016 18:51:33 +0000 (UTC) Cc: eggert@cs.ucla.edu, emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Mar 20 19:51:28 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 1ahiRi-0002dn-1z for ged-emacs-devel@m.gmane.org; Sun, 20 Mar 2016 19:51:26 +0100 Original-Received: from localhost ([::1]:54101 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahiRh-0006k1-7j for ged-emacs-devel@m.gmane.org; Sun, 20 Mar 2016 14:51:25 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahiRS-0006iI-K2 for emacs-devel@gnu.org; Sun, 20 Mar 2016 14:51:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahiRP-0000u9-Df for emacs-devel@gnu.org; Sun, 20 Mar 2016 14:51:10 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34631) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahiRP-0000u5-9i; Sun, 20 Mar 2016 14:51:07 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:1519 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ahiRN-0001gk-W5; Sun, 20 Mar 2016 14:51:06 -0400 In-reply-to: <56EEEE19.4000800@gmx.at> (message from martin rudalics on Sun, 20 Mar 2016 19:38:17 +0100) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:201954 Archived-At: > Date: Sun, 20 Mar 2016 19:38:17 +0100 > From: martin rudalics > CC: eggert@cs.ucla.edu, emacs-devel@gnu.org > > > How did you conclude that these commits are the culprit? > > Running > > git diff fbce4757a874cc43806eb41b8637538b101c3c69..82b089783e71b2aeef950eaecfe4cbc0735e64a2 src/window.c What is fbce4757a874cc43806eb41b8637538b101c3c69, and how is it related to the issue? My problem is that "git log -L" doesn't show my change at all, although searching through "git log src/window.c" I do see it. So I'm inclined to trust nothing I see about this particular matter. E.g., are we sure this didn't happen as part of the merges from emacs-25?