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 10:47:04 +0200 Message-ID: <87d19vozuf.fsf@gmx.us> 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; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1498207682 28214 195.159.176.226 (23 Jun 2017 08:48:02 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Fri, 23 Jun 2017 08:48:02 +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 10:47:58 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 1dOKFy-00074I-7R for ged-emacs-devel@m.gmane.org; Fri, 23 Jun 2017 10:47:58 +0200 Original-Received: from localhost ([::1]:34151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOKG3-0006SZ-HA for ged-emacs-devel@m.gmane.org; Fri, 23 Jun 2017 04:48:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dOKFL-0006Qh-PI for emacs-devel@gnu.org; Fri, 23 Jun 2017 04:47:20 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dOKFG-0007ln-Sh for emacs-devel@gnu.org; Fri, 23 Jun 2017 04:47:19 -0400 Original-Received: from [195.159.176.226] (port=52430 helo=blaine.gmane.org) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dOKFG-0007l8-LZ for emacs-devel@gnu.org; Fri, 23 Jun 2017 04:47:14 -0400 Original-Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1dOKF7-0004GY-OB for emacs-devel@gnu.org; Fri, 23 Jun 2017 10:47:05 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 64 Original-X-Complaints-To: usenet@blaine.gmane.org Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAP1BMVEWrq6tQUFA1FBQDAwMu Li6Ojo7l5eVvb2/+/v7GxsatBASIBweDLS2TVVWRd3drNzf9AABOLCxfERHRAgJvFRXOiP/lAAAA AXRSTlMAQObYZgAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90FFAsXM8Pp4IgAAAE0SURB VEjHtVXbroQgDNR2EskhZsm6//+tKywggoXycPqgCZmhnd5Ylq6t6zJjxKfNUDiYHg8PZsaEA3gW RbomoOAmudMQULEVkpHUaAkeB2Wy+GbxTE1IR/0qZKOEp1Ff3Bxwt4ioJYyUVwQe9tU/42M8MMZA g6cMN5lC43gC9mIMCScy/swoJK4IpQaW84MARVlwPDQT94001U3X163EIwP0t3MxrioHiNdts4TC ixJ/pRVRUg9Pdbmttzb1+f4I+0t/a/d9L/ZX7Nkrngh04ft27/pJwM+a8N3xWexxvAoBWdatk4Jb f9fhnLO32kmlPPFV8fCDSQSvX3oWpNJAxq9tQHgYIORkkGbJrNeIzK2xNh7qvdgkNeHMlmw7T46m mOkHzibPJ+qtsaE310GcFAk6gr+y1A82SZ92DwAAAABJRU5ErkJggg== Cancel-Lock: sha1:aNVbPRHHOwssIzgh9uBnPhzzup0= 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:215898 Archived-At: Hi Kyle, Thanks for carefully looking into this. >> 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. Perhaps I did something wrong. I used release 9.0.9, not the emacs-sync branch. So if there were additional changes on the emacs-sync branch on top of 9.0.9 I won’t have picked them up. This is the version I used: http://orgmode.org/cgit.cgi/org-mode.git/tag/?h=emacs-sync&id=release_9.0.9 > A few problems in scratch/org-mode-merge: > > * scratch/org-mode-merge reverts Emacs-specific changes in > etc/refcards/orgcard.tex. This same mistake was made in a previous > sync and fixed with Emacs's e90dec2be1. Since then, there have been > additional Emacs-specific changes added to orgcard.tex, and these > are all included in Org's emacs-sync branch. See above. So do you think it’s best to just cherry-pick these changes back? > * 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, and I can also add your ORG-NEWS formatting changes > to the Org repo. Note that the formatting itself is a bit weird in ORG-NEWS. At least on my normal Emacs setup it’s always changed when opened. The only issue was some dangling whitespace at the end of a couple of lines, which the Emacs commit hook didn’t like. > * The copyright years in Org's etc/styles/README have not been kept up > to date, so scratch/org-mode-merge is overwriting the updated years > in Emacs's etc/org/README. OK > And a question: > > * Should we include the "@set DATE ..." when we replace "@include > org-version.inc" in Emacs's org.texi? It doesn't seem like we have > in the past (e.g., in Emacs's 6f66f53f65). I don’t know. I think we should be bound by the Emacs practice, not what was done in the last sync aeon ago. Principally, I think documents should be dated. I don’t know if it’s right in an Emacs context, as it carries its own date. idlwave.texi and elisp.texi are the only other dated texi files. Rasmus -- Together we will make the possible totalllly impossible!