[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Missing changes in merges from emacs-25 to master
From: |
Eli Zaretskii |
Subject: |
Re: Missing changes in merges from emacs-25 to master |
Date: |
Mon, 21 Mar 2016 18:06:48 +0200 |
> Cc: Eli Zaretskii <address@hidden>, address@hidden,
> John Wiegley <address@hidden>
> From: Paul Eggert <address@hidden>
> Date: Mon, 21 Mar 2016 00:36:29 -0700
>
> commit 64a568d6100e5eab5b86e8bd31846212654d1fcf
> Author: Eli Zaretskii <address@hidden>
> 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.
- Re: Missing changes in merges from emacs-25 to master, (continued)
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, martin rudalics, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Andreas Schwab, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, martin rudalics, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Andreas Schwab, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, martin rudalics, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Óscar Fuentes, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, martin rudalics, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Noam Postavsky, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, martin rudalics, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master,
Eli Zaretskii <=
- Re: Missing changes in merges from emacs-25 to master, John Wiegley, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, John Wiegley, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Paul Eggert, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/21
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Stefan Monnier, 2016/03/22
- Re: Missing changes in merges from emacs-25 to master, Eli Zaretskii, 2016/03/22