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: org-merger questions Date: Thu, 22 Jun 2017 14:11:11 -0400 Message-ID: <87k2437v0g.fsf@kyleam.com> References: <874lv9fkdp.fsf@gmx.us> <87vanp5na3.fsf@bzg.fr> <87injotisu.fsf@gmx.us> <87mv906mfl.fsf@kyleam.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1498155091 16115 195.159.176.226 (22 Jun 2017 18:11:31 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 22 Jun 2017 18:11:31 +0000 (UTC) Cc: bzg@gnu.org To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jun 22 20:11:27 2017 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 1dO6Zi-0003rX-Lm for ged-emacs-devel@m.gmane.org; Thu, 22 Jun 2017 20:11:27 +0200 Original-Received: from localhost ([::1]:60378 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO6Zn-0007s5-Pe for ged-emacs-devel@m.gmane.org; Thu, 22 Jun 2017 14:11:31 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46336) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dO6Zc-0007qE-EN for emacs-devel@gnu.org; Thu, 22 Jun 2017 14:11:21 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dO6Zb-000255-G8 for emacs-devel@gnu.org; Thu, 22 Jun 2017 14:11:20 -0400 Original-Received: from pb-smtp1.pobox.com ([64.147.108.70]:62993 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dO6ZX-00023r-8X; Thu, 22 Jun 2017 14:11:15 -0400 Original-Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 68FD693998; Thu, 22 Jun 2017 14:11:13 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:in-reply-to:references:date:message-id:mime-version :content-type; s=sasl; bh=u3YE1ZaOD2IBVV/4GvKj/OJL7oI=; b=Md/5Gh H7v8Cvm19X9GPs8PV20qvrCbGMugOXS/pyheDnUD8i5Hy6p+rN9S7IxUQpFh2sW0 qDNnwajbJkm85Lm5NcWzAYBeJZTqkr9obGar9H+2WEfx2hOTJpDwBaVHhaBy9nGg vzp3ew1Fb1sIr9U9aeMxUUoR9q6oUawePeQ7w= Original-Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 61CED93997; Thu, 22 Jun 2017 14:11:13 -0400 (EDT) Original-Received: from localhost (unknown [24.60.167.92]) (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 C298993996; Thu, 22 Jun 2017 14:11:12 -0400 (EDT) In-Reply-To: <87mv906mfl.fsf@kyleam.com> X-Pobox-Relay-ID: 2CD60E7E-5776-11E7-A615-EFB41968708C-24757444!pb-smtp1.pobox.com DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=kyleam.com; h=from:to:cc:subject:in-reply-to:references:date:message-id:mime-version:content-type; s=mesmtp; bh=u3YE1ZaOD2IBVV/4GvKj/OJL7oI=; b=XrWi+7Sjb6MIND/5sc/h4jS1/Mb+afpDH93uOQHX/2yNBNEzA5whQmiRObYS+sJSmYCKCr5XXKBVUwuRURQQbyzYacG7zBzriZmnxYKeKOHzWlmmaZjSk5P3XzXm+HJWf57LdSMKEFsqGL84Ro7bH8ziY9V8DFI9x/RTGeLUTNI= 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:215889 Archived-At: Hi Rasmus, Kyle Meyer writes: > Rasmus writes: > >> I had to do a few whitespace cleanup to be able to commit. We should >> backport those, I guess. > > Hmm, I was hoping I had already caught most of them, but maybe the > issues you encountered were in the few files changed in > scratch/org-mode-merge that I didn't look at. I only checked > lisp/org/*.el, lisp/doc/misc/org.texi, and etc/refcards/orgcard.tex. It seems that etc/ORG-NEWS, od-manifest-schema-v1.2-os.rnc, and od-schema-v1.2-os.rnc all required whitespace cleanups. These cleanups are now included in Org's maint (and cherry-picked to the emacs-sync branch). > A few problems in scratch/org-mode-merge: [...] > * I made the mistake of not looking at ORG-NEWS for backports, so > scratch/org-mode-merge is reverting a few Emacs commits here. I'll > backport these I've backported all the changes to ORG-NEWS in maint (and cherry-picked them to the emacs-sync branch). Please consider using Org files from the emacs-sync branch instead of the release_9.0.9 tag. The emacs-sync branch is a superset of the last release, but it contains a few more changes that are specific for Emacs. These are changes that should not be in the maint branch but should be in the Emacs repo. In other words, these are the changes that we should make sure not to overwrite in a sync. For example, Org org.texi has "@include org-version.inc", but in the Emacs repo this should be "@set VERSION 9.0.9" instead. You can see these changes in the Org repo with git diff release_9.0.9..origin/emacs-sync (This diff also includes the whitespace cleanup and ORG-NEWS backports that were cherry-picked to emacs-sync because they are in the maint branch after release_9.0.9 but should be in the 9.0.9 sync.) > [...] and I can also add your ORG-NEWS formatting changes to the Org repo. I don't understand the formatting changes made in 5cfdf8dd17 (; Fix ORG-NEWS formatting in previous commit, 2017-06-22). Aside from fixing the alignment of a table that already seems correct in Org's ORG-NEWS, all the changes seem to be space to tab conversions. Are these necessary? -- Kyle