From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Rankin Newsgroups: gmane.emacs.bugs Subject: bug#24073: 25.1-rc2 Date: Sat, 01 Apr 2017 16:40:42 +1000 Message-ID: <1491028842.1395227.930599688.38B5B97F@webmail.messagingengine.com> References: <1469520753.418402.676896009.00AAC0DE@webmail.messagingengine.com> <1472605956.265564.710992545.0AE0C6FD@webmail.messagingengine.com> <83zintlkxl.fsf@gnu.org> <0085D3FE-32C4-4AFB-89DA-9DD205D8A2AB@paulwrankin.com> <83shtlkoba.fsf@gnu.org> <1472877535.1718060.714506377.6182C525@webmail.messagingengine.com> <83lgypi85j.fsf@gnu.org> <87twddnu5t.fsf@saiph.selenimh> <83eg4hi7i4.fsf@gnu.org> <1474278005.1585720.729925393.571A4732@webmail.messagingengine.com> <83r38fhm2t.fsf@gnu.org> <87shshhkva.fsf@bzg.fr> <1490861900.2033376.928338448.5AC2EDDB@webmail.messagingengine.com> <874lya2tcu.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Trace: blaine.gmane.org 1491028885 10362 195.159.176.226 (1 Apr 2017 06:41:25 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 1 Apr 2017 06:41:25 +0000 (UTC) Cc: Bastien Guerry , 24073@debbugs.gnu.org, mail@nicolasgoaziou.fr To: npostavs@users.sourceforge.net Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Apr 01 08:41:13 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuCif-0000lD-Hs for geb-bug-gnu-emacs@m.gmane.org; Sat, 01 Apr 2017 08:41:06 +0200 Original-Received: from localhost ([::1]:44134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuCil-0007vN-2Z for geb-bug-gnu-emacs@m.gmane.org; Sat, 01 Apr 2017 02:41:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cuCif-0007vI-Rz for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 02:41:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cuCic-0008AR-PJ for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 02:41:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:56770) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cuCic-0008AH-LW for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 02:41:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cuCic-0002kz-8B for bug-gnu-emacs@gnu.org; Sat, 01 Apr 2017 02:41:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Paul Rankin Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 01 Apr 2017 06:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 24073 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 24073-submit@debbugs.gnu.org id=B24073.149102884710569 (code B ref 24073); Sat, 01 Apr 2017 06:41:02 +0000 Original-Received: (at 24073) by debbugs.gnu.org; 1 Apr 2017 06:40:47 +0000 Original-Received: from localhost ([127.0.0.1]:54969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuCiN-0002kP-8R for submit@debbugs.gnu.org; Sat, 01 Apr 2017 02:40:47 -0400 Original-Received: from out1-smtp.messagingengine.com ([66.111.4.25]:39869) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cuCiJ-0002kE-9J for 24073@debbugs.gnu.org; Sat, 01 Apr 2017 02:40:45 -0400 Original-Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 98A1720AF9; Sat, 1 Apr 2017 02:40:42 -0400 (EDT) Original-Received: from web5 ([10.202.2.215]) by compute3.internal (MEProxy); Sat, 01 Apr 2017 02:40:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paulwrankin.com; h=cc:content-transfer-encoding:content-type:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=s1dPa34DHp/a6FVgA os8sxnOGkh3K0FnhcpbmEzpBU4=; b=aU3rfWQdVG6aDAWp5wH1eT7cPdrMCDP5Z 0KNmR6E8fBponApyF73CCkX4fq9DXG+EqsaU7gjmkqeIzr+3xtz5qHoRnmMcj7I0 9ZBY3Sjt/SWaTF828OniEEGLGM3/GgYyzVvBYLGBf5q4obUBvA9HylKX5JZ/+/Gj ip4ybLWot1I4oV59jNJB4Vhtceatxh1Y2SNJLX8WRTASLPXxLR57D9IJbc+c3XQR WEN/RYKLOze5XWBnzTUNOSvQGkeEDxJ0eut0WL+xRtxZ67kJOq0nobva/im0GvOj k0McyDSENfPlQsQi7Mz//AgYt9c/DansWOHnhE2SMmHPYSiAuSEDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=s1dPa3 4DHp/a6FVgAos8sxnOGkh3K0FnhcpbmEzpBU4=; b=D4+mCH7VkMZksgBSNfj4I3 HUBrtejvsTDL5oDyD7dpJX9Mff99hO8M2/qrh8nn3mzOGtVqSvHA+vmIkGRcorGp ION36Si37W8iyE0SYzqxjfz7Jb8S+nO+DUBbVMXY+0VfyrN6bD4OgjW3Nn11xZgy rbdbiiCoJT5iv2vNTdcIS+eqJv7KKR6JOlMkEi1aveZqnfsaHknkzlvoip2lHNRi YzprCWNPRnBf6F505O9UAP0iNxIcSA9wWDq6QACAmYi9VoDJ80s22IWS+88+s+9q +x71PmIgxmbM6QJLqul2adXcAIL4VewhFsbMTctHJQsULpL0XnUem/9GpJT7nBOw == X-ME-Sender: Original-Received: by mailuser.nyi.internal (Postfix, from userid 99) id 6F8A49E210; Sat, 1 Apr 2017 02:40:42 -0400 (EDT) X-Mailer: MessagingEngine.com Webmail Interface - ajax-6cc8b445 In-Reply-To: <874lya2tcu.fsf@users.sourceforge.net> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:131154 Archived-At: On Fri, 31 Mar 2017, at 10:16 AM, npostavs@users.sourceforge.net wrote: > Paul Rankin writes: > > > I can see this fix in master [1] but I'm on 25.2-rc2 [2] and > > outline.el.gz still shows the old outline-invisible-p function. > > > > Sorry, can anyone let me know where I've gone wrong? > > Essentially we kind of missed the boat, and we're back in the same > situation as [53] this time for 25.2: it's about to be released so > it's a bit late to make non-critical code changes. The code in master > will become 26.1. > > [53]: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=24073#53 Hmm this just raises more questions for me... If I'm following correctly, the patch to outline.el was applied to master on a commit 9cc59ffbbb2f20fbbf1c72d2e0c9dc47c7906a99 on 30 September 2016. Then the "emacs-25.2-rc2" tag was applied to commit fe91ff27c54cc10b70a5c5d5bac4017922866717 on master on 22 February.[1] If I browse the master tree at fe91ff27c54cc10b70a5c5d5bac4017922866717 the patch to outline.el is *not* there.[2] But if I browse the current master tree, the patch is there.[3] So the patch was on master, then it was not, and now it is (but not in release candidate). Hence I'm super confused about the Emacs dev team's git workflow....? [1]: https://github.com/emacs-mirror/emacs/blob/9cc59ffbbb2f20fbbf1c72d2e0c9dc47c7906a99/lisp/outline.el#L393 [2]: https://github.com/emacs-mirror/emacs/blob/fe91ff27c54cc10b70a5c5d5bac4017922866717/lisp/outline.el#L393 [3]: https://github.com/emacs-mirror/emacs/blob/master/lisp/outline.el#L393