From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Kyle Meyer Newsgroups: gmane.emacs.devel Subject: Re: emacs-26 e1a9dc0: Recognize Org as builtin package (bug#30310) Date: Sat, 03 Feb 2018 12:03:05 -0500 Message-ID: <87k1vu80qe.fsf@kyleam.com> References: <20180203020920.8044.90158@vcs0.savannah.gnu.org> <20180203020921.3129120445@vcs0.savannah.gnu.org> <87y3kamovt.fsf@gmx.de> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1517677560 27218 195.159.176.226 (3 Feb 2018 17:06:00 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 3 Feb 2018 17:06:00 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) Cc: Bastien Guerry , Glenn Morris , emacs-devel@gnu.org To: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Feb 03 18:05:55 2018 Return-path: Envelope-to: ged-emacs-devel@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 1ei1Fy-0005YK-BC for ged-emacs-devel@m.gmane.org; Sat, 03 Feb 2018 18:05:38 +0100 Original-Received: from localhost ([::1]:52585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ei1Hx-0005U8-Kb for ged-emacs-devel@m.gmane.org; Sat, 03 Feb 2018 12:07:41 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ei1Dk-0002iV-Pd for emacs-devel@gnu.org; Sat, 03 Feb 2018 12:03:22 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ei1Dj-0006Wr-KY for emacs-devel@gnu.org; Sat, 03 Feb 2018 12:03:20 -0500 Original-Received: from pb-smtp1.pobox.com ([64.147.108.70]:61827) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ei1De-0006R8-QU; Sat, 03 Feb 2018 12:03:14 -0500 Original-Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 160E0CEAA2; Sat, 3 Feb 2018 12:03:13 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=LXte/+XC4qhoO0yPpAyIGcFAkLQ=; b=x3blEE ozOWHQNOh0CeoO3dTAdrMoe/3WSdhona00hzSak3Jq89ut2raC2xxePOSXHylDuA nD4HTJKvLvvQ4dap/ZwaTyuq5QZuck2adx9hgF/oSgYfKHzCVYi5JcSrTPmKpVw+ SX3JQR3Gu4BDVWe0au8k6fc6dGWLYha1GClvE= Original-Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 0D36FCEAA1; Sat, 3 Feb 2018 12:03:13 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=kyleam.com; h=from:to:cc:subject:references:date:in-reply-to:message-id:mime-version:content-type; s=mesmtp; bh=mXU2ukapSXX8T4DkeV4BJikQ+0bsCcv+DWMcabqROYk=; b=xJJhrqmuzW3vmxpWF1HJVO+coqL+5kWksdSv4CEL+/ZSOhad0Tnjb/XRFfgR801FYPMAwkXoe7NKNg+LatAxJanxlGyxMqds7iADiVC2z7UUY+4TYWqcEGi2NwOOUOvFiHp0LRRyHtEJDHVG5ys0gcpLyapHgM/U5jbJnOTfmEc= Original-Received: from localhost (unknown [76.118.43.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 7E16CCEAA0; Sat, 3 Feb 2018 12:03:12 -0500 (EST) In-Reply-To: <87y3kamovt.fsf@gmx.de> (Michael Albinus's message of "Sat, 03 Feb 2018 09:57:42 +0100") X-Pobox-Relay-ID: 1E28D84E-0904-11E8-97C9-692D1A68708C-24757444!pb-smtp1.pobox.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 64.147.108.70 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 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" Xref: news.gmane.org gmane.emacs.devel:222469 Archived-At: Hi Michael and Glenn, [Commenting on e1a9dc0 first and then Michael's mail.] > diff --git a/lisp/org/org.el b/lisp/org/org.el > index 5272061ccc..4e4620549c 100644 > --- a/lisp/org/org.el > +++ b/lisp/org/org.el > @@ -7,6 +7,7 @@ > ;; Maintainer: Carsten Dominik > ;; Keywords: outlines, hypermedia, calendar, wp > ;; Homepage: http://orgmode.org > +;; Version: 9.1.6 I'll add this to Org's repo. It isn't appropriate for either of Org's mainline branches (maint or master) because we don't hardcode the version anywhere in these branches, but I'll put it on the branch whose content is synced with the Emacs repo. (This branch is a superset of maint and includes various commits that are specifically targeted at the Emacs repo.) > diff --git a/test/lisp/org/org-tests.el b/test/lisp/org/org-tests.el > new file mode 100644 Given that we don't hardcode the version, this new test would fail in the Org repo's mainline branches. Michael Albinus writes: > rgm@gnu.org (Glenn Morris) writes: > > Hi Glenn, > >> diff --git a/test/lisp/org/org-tests.el b/test/lisp/org/org-tests.el >> new file mode 100644 > > Org has defined already several hundreds of ert based tests: > > $ find ~/src/org-mode/testing -name \*.el | xargs grep \(ert-deftest | wc -l > 783 > > We shall sync our own tests with them. As I noted above, the single test in the new file would fail in the Org repo. > And I would appreciate to see those tests also in Emacs' git. I'd like to see that too. I think you've requested this before, but I don't recall where that discussion ended up. Assuming Rasmus and Bastien are OK with including the tests, I'll work on making the necessary changes, with the goal of including the tests once we start targeting our syncs to Emacs's master rather than the emacs-26 branch. In addition to including the test files in the sync and making sure they're working from the Emacs repo, another issue is that many of the files don't list the FSF as the copyright holder. -- Kyle