From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: Missing changes in merges from emacs-25 to master Date: Mon, 21 Mar 2016 00:36:29 -0700 Organization: UCLA Computer Science Department Message-ID: <56EFA47D.8020303@cs.ucla.edu> References: <56EE8B27.3090208@gmx.at> <83d1qp6on1.fsf@gnu.org> <56EEEE19.4000800@gmx.at> <8360wh6l1a.fsf@gnu.org> <56EEF6DA.3050104@gmx.at> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1458545827 8148 80.91.229.3 (21 Mar 2016 07:37:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Mar 2016 07:37:07 +0000 (UTC) Cc: John Wiegley , Eli Zaretskii , emacs-devel@gnu.org To: martin rudalics Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Mar 21 08:36:55 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 1ahuOU-0000Pv-7w for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 08:36:54 +0100 Original-Received: from localhost ([::1]:56015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahuOT-0002tc-PT for ged-emacs-devel@m.gmane.org; Mon, 21 Mar 2016 03:36:53 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60740) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahuOG-0002tV-QJ for emacs-devel@gnu.org; Mon, 21 Mar 2016 03:36:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahuOF-0007gB-Ni for emacs-devel@gnu.org; Mon, 21 Mar 2016 03:36:40 -0400 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:44855) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahuOB-0007fk-Ls; Mon, 21 Mar 2016 03:36:35 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id A69E3160175; Mon, 21 Mar 2016 00:36:31 -0700 (PDT) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id eHmGhEiNlo3h; Mon, 21 Mar 2016 00:36:30 -0700 (PDT) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 42C24160843; Mon, 21 Mar 2016 00:36:30 -0700 (PDT) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id hDelxFUEMK16; Mon, 21 Mar 2016 00:36:30 -0700 (PDT) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 07426160175; Mon, 21 Mar 2016 00:36:30 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 In-Reply-To: <56EEF6DA.3050104@gmx.at> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 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:201974 Archived-At: As near as I can make out, the changes in this commit: commit aa636c8465b03c09249dccd68fca3d1df04eaa2c Author: Eli Zaretskii 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 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 int= o emacs-25 This merge commit skips a merge, which I think causes this particular pro= blem.=20 This merge commit is a parent of: commit 140016558bcb462692d8b9f2f3f866e0f337d218 Merge: 7823745 3ae7934 Author: John Wiegley 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 fi= le-names 2ffdf15 * lisp/help-fns.el (describe-variable): Fix a left-over pare= nthesis 71ecd62 * lisp/dired-x.el (dired-omit-here-always): Use add-dir-loca= l-variable f0b82b3 * lisp/files.el (dir-locals--all-files): Use completion inst= ead of=20 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 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 Date: Mon Jan 18 22:59:51 2016 -0800 - which in turn is a parent of: commit b895c72059521fec064ff27b4cfcfa4104081c4e Merge: badcd38 1b76d91 Author: Vincent Bela=C3=AFche 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=20 82b089783e71b2aeef950eaecfe4cbc0735e64a2 that you identified as losing th= e=20 change. One of the entries in that graph is this commit: 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.