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: Re: Missing changes in merges from emacs-25 to master Date: Tue, 22 Mar 2016 12:47:53 +0100 Message-ID: <56F130E9.2040507@gmx.at> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> <56EFA47D.8020303@cs.ucla.edu> <56EFBD68.1050307@gmx.at> <56F0358F.7000103@cs.ucla.edu> <56F11CC8.4000406@gmx.at> <56F1255C.7090301@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 1458647334 2467 80.91.229.3 (22 Mar 2016 11:48:54 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 22 Mar 2016 11:48:54 +0000 (UTC) Cc: John Wiegley , Eli Zaretskii , Paul Eggert , emacs-devel@gnu.org To: Andreas Schwab Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Mar 22 12:48:46 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 1aiKnQ-00007K-4s for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 12:48:24 +0100 Original-Received: from localhost ([::1]:35498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiKnK-0003kF-6m for ged-emacs-devel@m.gmane.org; Tue, 22 Mar 2016 07:48:18 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiKnG-0003k1-R3 for emacs-devel@gnu.org; Tue, 22 Mar 2016 07:48:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aiKnG-0005tZ-0X for emacs-devel@gnu.org; Tue, 22 Mar 2016 07:48:14 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]:61765) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aiKnA-0005so-9t; Tue, 22 Mar 2016 07:48:08 -0400 Original-Received: from [192.168.1.100] ([212.95.7.15]) by mail.gmx.com (mrgmx002) with ESMTPSA (Nemesis) id 0LwJFG-1ZiMCV1TIs-0186QC; Tue, 22 Mar 2016 12:48:01 +0100 In-Reply-To: X-Provags-ID: V03:K0:A7jMSrLtCwq7QwYb/NpF/xlHh6SPwdlcPqJqRjeeTEkQCcOUdtO UIOJXsAS6qrydLvI84ePRYE0ihTZr80KmomQLtFAe7yA1bSTK8cJ3UhEqQUm1ORncaS1RaD STW7jPWy1vq87EvLDAr5p/3RjYZR6oRvN1UjeqyUN8jDXjwUJnOaLAOC+TIzWQe7/XTxCRU bduVNrN+e6kurVrUf/2UQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:W8krXCqVKqE=:H2/HUEstBYbcZHvieCsSe2 iFkaNrNZ1QanUXf5sldYj+Xo0Rw3npM5OaJD7otLllpwvVJ6TETTQ5ym+0FH8LnJ8sG+FyZW7 46tSBi7w2MaW6Nwqi5QgLXSC5ZIeI9TLcvBk2OgQFWXGJIUzc/17Nm2xUuaUvwmocu8/lvCQ8 Q3M0IPioKfq9Hl36GA+JeoYpvSP3QKF64+Wvrucddnf8wqq4zmC5tIf8LpwDNBl8MEe6v6L3Y wFd1w7lWXxdEauRzWPGJlL61Ybmo7pMF+/2nr1AVzZTgdxsVN58pGNiwETgvi5p9ESkWPLJ1+ EqBJTWXhD4VQVxIaVF1bFhgwNerC5WaajCWcK0iByzMBMX9VABxbM8sptXA7Yc5S4c3ZYhWf+ ps4k9GY6gVWzKozlqj+AkV0FHdNxmCiXctJAYeMb0OYSPfkJqt4OpCjHLoL/tJCJ6g1wQ4HFf dhdCMX5nHvTeVK4ztM44FHNDOdg6rqMNZ2Sx5GWWrOKk6FStQmezx8Wz+/It6LOLwSOgQQV/L +HkNWcDmXE0YxH6BwxFfOqBvS0b1xHS9a2Fx4OYZ7ggRXWfCHhmWde4UdO/NHjI53v3ypuEpL flVP1RZrFTRM/UAQv9wR5jXRbHMnFJQVeW2GeyIpr8vuIET9hYRDy0IccrySCInMTrl2CKmMX Hs34GKVBxrJM+N9dTdEw6XHZf47HXBFZA5DiULj7l3wZv7+z8OUUPJtT2sbao7u3AJnIdNrzf c1buR6f9/8O0czo7DFxrSxdJNGP2xOncamqUlCc0Pw6hRA9vJA2+dNuaYoBfBpgxlss4vWNd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.15.19 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:202062 Archived-At: > git diff 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa^2 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa -- src/window.c With git version 1.9.4.msysgit.2 (on Windows) this gets me git diff 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa^2 9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa -- src/window.c fatal: bad revision '9304e6d3a222de6ef1c405bfd6e09eee6ed2c2aa2' martin