From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Rasmus Newsgroups: gmane.emacs.devel Subject: Re: org-merger questions Date: Fri, 23 Jun 2017 11:04:26 +0200 Message-ID: <878tkjoz1h.fsf@gmx.us> References: <874lv9fkdp.fsf@gmx.us> <87vanp5na3.fsf@bzg.fr> <87injotisu.fsf@gmx.us> <87mv906mfl.fsf@kyleam.com> <87k2437v0g.fsf@kyleam.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1498208690 29000 195.159.176.226 (23 Jun 2017 09:04:50 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 23 Jun 2017 09:04:50 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.50 (gnu/linux) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jun 23 11:04:47 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 1dOKWE-0007OA-Id for ged-emacs-devel@m.gmane.org; Fri, 23 Jun 2017 11:04:46 +0200 Original-Received: from localhost ([::1]:34268 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOKWJ-00027D-Sc for ged-emacs-devel@m.gmane.org; Fri, 23 Jun 2017 05:04:51 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOKWC-00026q-Ph for emacs-devel@gnu.org; Fri, 23 Jun 2017 05:04:45 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dOKW8-0000xT-RO for emacs-devel@gnu.org; Fri, 23 Jun 2017 05:04:44 -0400 Original-Received: from [195.159.176.226] (port=48342 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dOKW8-0000uA-LK for emacs-devel@gnu.org; Fri, 23 Jun 2017 05:04:40 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1dOKW0-0006gf-Rv for emacs-devel@gnu.org; Fri, 23 Jun 2017 11:04:32 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 61 Original-X-Complaints-To: usenet@blaine.gmane.org Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAElBMVEUvLy91dXVUVFSRkZGs rKzQ0NCgYj8zAAACUUlEQVQ4y2XTXZKbMAwAYONeAEn03RJ7gAiZ9ya235sG3/8qFbBkd1oNM5nx F/1YDOEdUUDC/xHBlNTpH4ymYOACsMX0DchAgcDI2uPx7XzYz00NaessGObxKmRGpkWxtQfjOJer kAI1bQvCdvdOAsu7EE39Y4uaoLUXAbwTtKzPducUIgGDJoZxTyBbresLJTAmAQA2DR5s9PrZOfe+ Fe/mD5+1QFddnx99AzOVPVjTsQxYoY+Mnqvc+mYo8ZgJ9MmKAmbL3D2qzntC+gHTAsF7kg59j4JH BxkIOEURQPzZe+v9BemYaVBEAD+n2+qD+YMHDIKSOLCQ/drB8obHCiOyAQZhstvUu6UIJwzC++TM cMB9nyccECUFBgQqt9o7Sojp7DFIFAYgssVb8J/A59IjSHIgpbzDimH+84YkDlYfza99j9MznHGA qeX9HkV5fX0Bk4HV24ePe4f6BYGpgOXxR+8ZJG/neXQAulPN4+yvCjn376C5rH7BWpLUnk6IDqbF m081q0DMnyBfYAUHQvnsfUKu+UZkKIDXUFEOKHkk0iQSLhAH1bU2gQlE+Hm18JpkVLctggFKkfAF s1ltfyIZyLxckE7o/RbYkCco10JGDNFy75wiKVh7nT1Y0Oebc3+Keor/436CCLK/x/YShsUl3/EC 8Z0MJkILLUHAp79gGMOsDoakIfr51WMeYzaUbAr0O15frESkNGfVyZeigNHeACC5bVZrMc+Jt/AG +ah1K1RrLgV4/ASMMNRWt1qglloVbm/AyY+9jlL2H3yc1/gLV++FkXU0IfkAAAAASUVORK5CYII= Cancel-Lock: sha1:0KpXkNAFcC68nzEF+yNs1OF4t+U= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 195.159.176.226 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:215899 Archived-At: Hi Kyle, Thanks again. I synced your suggested changes. Kyle Meyer writes: > 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). Indeed. Those were the ones it complained about. >> 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. Cool. Thanks a lot. As said in the previous post, I didn’t use this branch. > 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.) I updated the files in question to the "emacs-sync" version. I had to change the version in orgcard.tex as it wasn’t 9.0.9. >> [...] 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? I must have done a mistake. ORG-NEWS seems to always change when I open with my normal Emacs configuration. So I redid the whitespace cleanup with "emacs -q" but apparently that also induced unnecessary changes. Thanks for fixing this! Rasmus -- Enough with the blah blah!