Re: Missing changes in merges from emacs-25 to master

[Paul Eggert]

As near as I can make out, the changes in this commit:

commit aa636c8465b03c09249dccd68fca3d1df04eaa2c
Author: Eli Zaretskii <address@hidden>
Date:   Fri Jan 15 17:07:38 2016 +0200

    Fix crashes when mini-window has non-zero margins


were first lost in this merge commit:

commit 7823745acbe9b87eea2db4ef434e379fc903ec35
Merge: 6acd2aa bb0cd31
Author: John Wiegley <address@hidden>
Date:   Mon Jan 18 22:56:33 2016 -0800

    ; Merge from origin/emacs-25

    The following commit was skipped:

    bb0cd31 Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into 
emacs-25


This merge commit skips a merge, which I think causes this particular problem. 
This merge commit is a parent of:

commit 140016558bcb462692d8b9f2f3f866e0f337d218
Merge: 7823745 3ae7934
Author: John Wiegley <address@hidden>
Date:   Mon Jan 18 22:56:34 2016 -0800

    Merge from origin/emacs-25

    3ae7934 ; * etc/NEWS: Mark entries that don't need further treatment.
    6165c36 * lisp/files.el (dir-locals--all-files): Respect absolute file-names
    2ffdf15 * lisp/help-fns.el (describe-variable): Fix a left-over parenthesis
    71ecd62 * lisp/dired-x.el (dired-omit-here-always): Use 
add-dir-local-variable
    f0b82b3 * lisp/files.el (dir-locals--all-files): Use completion instead of 
wildcards
    86e4513 Fix incompatbilities with MS-Windows 2000 and older
    4e96521 Mention in PROBLEMS an issue with MS-Windows NT4
    15c23aa Ensure 8-byte aligned memory allocation on MS-Windows 9X
    39afa42 Fix tests for active region in hideif.el
    05df666 Fix interactive specs in some hideif.el commands


which in turn is a parent of:

commit bca49307c8ea3f96d6eede375a7f42091ae5d5af
Merge: 1400165 6e79b63
Author: John Wiegley <address@hidden>
Date:   Mon Jan 18 22:56:34 2016 -0800

    ; Merge from origin/emacs-25

    The following commit was skipped:

    6e79b63 ; Auto-commit of loaddefs files.


which in turn is a parent of:

commit 1b76d9168336ede8976b980aeaed64ae2908501a
Merge: bca4930 2e5a89f
Author: John Wiegley <address@hidden>
Date:   Mon Jan 18 22:59:51 2016 -0800

    -

which in turn is a parent of:

commit b895c72059521fec064ff27b4cfcfa4104081c4e
Merge: badcd38 1b76d91
Author: Vincent Belaïche <address@hidden>
Date:   Wed Jan 20 08:30:51 2016 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

which leads via a long thin graph to the merge commit 
82b089783e71b2aeef950eaecfe4cbc0735e64a2 that you identified as losing the 
change. One of the entries in that graph is this commit:

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.