From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id mAj7HQaBcGWuTwAA9RJhRA:P1 (envelope-from ) for ; Wed, 06 Dec 2023 15:11:18 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id mAj7HQaBcGWuTwAA9RJhRA (envelope-from ) for ; Wed, 06 Dec 2023 15:11:18 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5FAFA47DA0 for ; Wed, 6 Dec 2023 15:11:18 +0100 (CET) Authentication-Results: aspmx1.migadu.com; none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAsbb-0007Rj-8Z; Wed, 06 Dec 2023 09:10:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAsbS-0007RQ-1U for emacs-orgmode@gnu.org; Wed, 06 Dec 2023 09:10:18 -0500 Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAsbP-0000d9-2p for emacs-orgmode@gnu.org; Wed, 06 Dec 2023 09:10:17 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 63FED24002A for ; Wed, 6 Dec 2023 15:10:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1701871808; bh=mDldD8Cp7yBwc+5FcBlSvQN1uux+ufDRj5UR4DoQlCo=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=f7mkIoyu1T9EtLP+sD8j3qu6EIPoMvTAapGPhAq0MvCD4jjJ3bhjcouCiq6DxECpW N92PiMMYVI+hye3SVrKL/mQzx/KBWG4SWMxxV8xkduINSAUOFyvjyRN/EaZj6U3cdW kTZUHiQszxsfkFU7m5iMMq35KlAmSxDGuacwIOG4QJ9Jd+snfclTlHs3r+SwAysxZZ bAMuMCb5q/9GamINYXajjphP9bTxIzUdEWIm/k/mr4bmrswui3DuXHXOgCh/3vWrQG DqtTNXywXDp3gpCirq+2HbcJ9/GDSIzxE5ycow6VZ6FU3wlWozQyrXoYNAlhUQMsud 3VOz1WfLIJi7Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4SlfRz4dvlz6v03; Wed, 6 Dec 2023 15:10:07 +0100 (CET) From: Ihor Radchenko To: Kyle Meyer Cc: Bastien Guerry , emacs-orgmode@gnu.org Subject: Re: Syncing orgcard.tex with upstream Emacs (was: bug#64578: orgcard.tex fixes to allow PDF rendering to be used as a triptych.) In-Reply-To: <87ttowt89m.fsf@kyleam.com> References: <874jm8ythh.fsf@localhost> <875y4bbz13.fsf@localhost> <87r0kr9xke.fsf@localhost> <871qcl33o2.fsf@gnu.org> <87ttoym8qu.fsf@localhost> <87wmttti1k.fsf@kyleam.com> <87bkb4x1t8.fsf@localhost> <87ttowt89m.fsf@kyleam.com> Date: Wed, 06 Dec 2023 14:13:10 +0000 Message-ID: <87r0jzl8qx.fsf@localhost> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=185.67.36.65; envelope-from=yantar92@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx11.migadu.com X-Migadu-Spam-Score: -4.00 X-Spam-Score: -4.00 X-Migadu-Queue-Id: 5FAFA47DA0 X-TUID: 5AlTiBQ4jkDW --=-=-= Content-Type: text/plain Kyle Meyer writes: >> Aside: It appears to be only partially documented in >> https://orgmode.org/worg/org-maintenance.html#emacs-sync. In particular, >> the last two lines. > > I'm happy to clarify or add to those docs. I didn't write them, but I > did go through them somewhat recently to better align them with the > actual porting/syncing process. > > With respect to the emacs-sync branch, that page currently says > > Typically, Org can be synchronized by copying over files from the > emacs-sync branch of the Org repository to the master branch of Emacs > repository. The emacs-sync branch has a few extra changes compared > with the bugfix branch > > Would you like me to add more details about why the branch exists? How > it's managed? Something else? I think that a reference to https://git.kyleam.com/orgmode-backport-notes/tree/orgmode-backports.org#n2 might be helpful. Maybe we should even have that file in the main repo as a part of emacs-sync branch? >> May we just add >> >>> +\centerline{For more Emacs documentation, and the \TeX{} source for this card, see} >>> +\centerline{the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}} >> >> to Org repo? > > These lines (or rather what became these lines) were added in Emacs's > 4af5981dc75 (Add a comment in generated refcards about the source, > 2016-11-17). I decided to port that commit to emacs-sync rather than a > primary Org branch because I felt it only applied to the Org card > distributed as part of the Emacs tree. From my notes [*]: > > I'm skipping this because it isn't true when the card is from the Org > mode repo. > > However, if you prefer to include those lines in Org's copy, that's fine > by me. I can see the point. Although, I feel like accumulating such divergence may backfire after some time. May we possibly resolve the conflict properly using something like the attached patch? Then, we can use the same orgcard source but have orgcardemacsnotice.tex empty in Org repository. Are there other similar conflicts in emacs-sync branch? --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-etc-refcards-orgcard.tex-Put-Emacs-specific-part-int.patch >From 23a6b95b4755a7a2251e89db6ed91ac8637a8035 Mon Sep 17 00:00:00 2001 Message-ID: <23a6b95b4755a7a2251e89db6ed91ac8637a8035.1701871917.git.yantar92@posteo.net> From: Ihor Radchenko Date: Wed, 6 Dec 2023 15:09:59 +0100 Subject: [PATCH] etc/refcards/orgcard.tex: Put Emacs-specific part into a separate file * etc/refcards/orgcardemacsnotice.tex: New file containing Emacs-specific copyright notice. This is to be kept in Emacs repository. * etc/refcards/orgcard.tex: Include the new file, so that we do not need to maintain divergence between Org repository version of orgcard and the Emacs version. The Org version does not refer to Emacs distribution and the original source. Link: https://orgmode.org/list/87ttowt89m.fsf@kyleam.com --- etc/refcards/orgcard.tex | 3 +-- etc/refcards/orgcardemacsnotice.tex | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 etc/refcards/orgcardemacsnotice.tex diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index 4b73a544e80..9d875e0f201 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -79,8 +79,7 @@ \centerline{Released under the terms of the GNU General Public License} \centerline{version 3 or later.} -\centerline{For more Emacs documentation, and the \TeX{} source for this card, see} -\centerline{the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}} +\input orgcardemacsnotice.tex \endgroup} diff --git a/etc/refcards/orgcardemacsnotice.tex b/etc/refcards/orgcardemacsnotice.tex new file mode 100644 index 00000000000..ce7117c2330 --- /dev/null +++ b/etc/refcards/orgcardemacsnotice.tex @@ -0,0 +1,2 @@ +\centerline{For more Emacs documentation, and the \TeX{} source for this card, see} +\centerline{the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}} -- 2.42.0 --=-=-= Content-Type: text/plain -- Ihor Radchenko // yantar92, Org mode contributor, Learn more about Org mode at . Support Org development at , or support my work at --=-=-=--