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: Mon, 21 Mar 2016 18:06:48 +0200 Message-ID: <83zitr6civ.fsf@gnu.org> 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> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1458576447 26184 80.91.229.3 (21 Mar 2016 16:07:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Mar 2016 16:07:27 +0000 (UTC) Cc: rudalics@gmx.at, johnw@newartisans.com, emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 21 17:07:24 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 1ai2MT-0003Po-Qa for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 17:07:21 +0100 Original-Received: from localhost ([::1]:58774 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai2MT-0005ur-6p for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 12:07:21 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai2MP-0005ub-EF for emacs-devel@gnu.org; Mon, 21 Mar 2016 12:07:18 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ai2MO-0004Dt-IK for emacs-devel@gnu.org; Mon, 21 Mar 2016 12:07:17 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:58500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ai2MJ-00049t-Fz; Mon, 21 Mar 2016 12:07:11 -0400 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2816 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1ai2MI-0001rP-JU; Mon, 21 Mar 2016 12:07:11 -0400 In-reply-to: <56EFA47D.8020303@cs.ucla.edu> (message from Paul Eggert on Mon, 21 Mar 2016 00:36:29 -0700) 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:202005 Archived-At: > Cc: Eli Zaretskii , emacs-devel@gnu.org, > John Wiegley > From: Paul Eggert > Date: Mon, 21 Mar 2016 00:36:29 -0700 > > commit 64a568d6100e5eab5b86e8bd31846212654d1fcf > Author: Eli Zaretskii > Date: Wed Jan 20 11:47:19 2016 +0200 > > Fix MS-Windows build broken by a botched merge from emacs-25 > > * src/w32.c (w32_crypto_hprov): New static variable. > (globals_of_w32): Initialize w32_crypto_hprov. > (w32_init_crypt_random, w32_init_random): New functions. > Include wincrypt.h. > * src/w32.h (w32_init_random): Add prototype. > > > which indicates that Eli noticed a problem around then. I didn't: the compiler did. This omission caused compilation failures, so I looked into that and found the problem. But I didn't try looking for other similar omissions, and even if I'd think about that (which I didn't), I wouldn't know how to do that. Is there some handy set of Git commands to help in this matter? I hope the reason(s) for these problems could be revealed, because otherwise we don't really know what we have on master, code-wise.