From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id iFFIFS3Sb2VxbwAAG6o9tA:P1 (envelope-from ) for ; Wed, 06 Dec 2023 02:45:17 +0100 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id iFFIFS3Sb2VxbwAAG6o9tA (envelope-from ) for ; Wed, 06 Dec 2023 02:45:17 +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 9A39113793 for ; Wed, 6 Dec 2023 02:45:16 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=kyleam.com header.s=key1 header.b="Og/7yxCP"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1701827117; a=rsa-sha256; cv=none; b=mOylCRS3CWFMXA+x0RMS/TK6QU/OF9FjThINEV72lCVA1MvfgeMF6m1AKd+NLEf8JmIzpf oZvKtYDbceGkDn+I5f2A4vfXs2i+v6Sxe0WY6LMIFTpoDKkqpsoT4MXLH69hcGkZuYaQd5 Xv3peGsgUWEW15U0q3+dHu5LDYuKKNRVbUbqqQtysPorE96FrnR5fbaeTGlTTz7fxacRsb oKHYixxdPnsHRfe72IwUHZURsY39Fh19T+pOj2ikfuwzRv62J9K2rQE0Ex8z2BtPv5Qj1d 5kHvzRqSN8dF67SC3Ke4+o34klVk38lrIjNFEUdc5PtcxyWvxru7iW5DHJ/6fw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=kyleam.com header.s=key1 header.b="Og/7yxCP"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1701827117; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=JPxG0tTLfEGy+JTuhzTU2qAKl2nFtd2Oikb1Asg2FzU=; b=CCRYVY2B5g/LE7k8e029uyt0EkgH61CelSE7VG45nAOiS6qWdEAAg3CNWMWQ1lBNchAvQM BVgb66D//7vZMS2hfkwPVGNBz3rza+u/Eylin5nC+O60AzeBWP//oAylnCSKlEI5AXST8D RL2OkYPo4dHAfzprwDAC1dmDu0lhsmFw7sztZ7Evlqfk0ZV2lJjqLGOH76hMgSA9lP0oyb pJab5IGmSVXMzU1QdlA20499qQ9ibg3ryAkNZ2R3iHctwSWAbGw0P2XFD0sbuKjhZ0J3sv v+noc6KqI2f0eDog+spBOsdVeLRWWu90OoKqrG0wW7OZPyZ4xm8kt6xuiolofw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rAgxV-00075H-P7; Tue, 05 Dec 2023 20:44:17 -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 1rAgxT-000755-Vx for emacs-orgmode@gnu.org; Tue, 05 Dec 2023 20:44:16 -0500 Received: from out-176.mta1.migadu.com ([2001:41d0:203:375::b0]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rAgxR-0003hI-IU for emacs-orgmode@gnu.org; Tue, 05 Dec 2023 20:44:15 -0500 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kyleam.com; s=key1; t=1701827051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=JPxG0tTLfEGy+JTuhzTU2qAKl2nFtd2Oikb1Asg2FzU=; b=Og/7yxCP/xNzlDIgBJN+b/Lomjmfz/YQ0gqjG+R0lMv/IJ6eajWqbX3XPd3xdZZsj7oHIF Ke6dNlrxe7r045N4+qSwwn7oixZAt3wsMs0WGgsY9APZQwCjUOL5n9sEeaWfEg+HBwyvpC IYT2wePM6kbFoyMJMA//dpFgj+lxZtVcZnmagcmMvPbJzI0X0d6jJ32Qsn2IfZtp9khVib 1kIwMyklFUGn8Sblk6e7p423sOmrKGxpFIjoT/58pKlildpfJr69YRNk96+kHfsVIfJUgm GopqPp9bzX2v0X0QQft0m4DjE2CMjY9tX3ZgPWfvgIkvMNCpS80VCrkgbYc4eQ== From: Kyle Meyer To: Ihor Radchenko 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: <87bkb4x1t8.fsf@localhost> References: <874jm8ythh.fsf@localhost> <875y4bbz13.fsf@localhost> <87r0kr9xke.fsf@localhost> <871qcl33o2.fsf@gnu.org> <87ttoym8qu.fsf@localhost> <87wmttti1k.fsf@kyleam.com> <87bkb4x1t8.fsf@localhost> Date: Tue, 05 Dec 2023 20:44:05 -0500 Message-ID: <87ttowt89m.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2001:41d0:203:375::b0; envelope-from=kyle@kyleam.com; helo=out-176.mta1.migadu.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, 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: mx13.migadu.com X-Migadu-Spam-Score: -6.82 X-Spam-Score: -6.82 X-Migadu-Queue-Id: 9A39113793 X-TUID: nrO7Iaq4+szt Ihor Radchenko writes: > Kyle Meyer writes: > >> Here is the difference between the two cards, as of the last sync: >> >> -\input org-version.tex >> +\def\orgversionnumber{9.6.11} >> +\def\versionyear{2023} % latest update >> +\input emacsver.tex >> ... >> +\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}} >> + > > 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? > 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. [*] https://git.kyleam.com/orgmode-backport-notes/tree/orgmode-backports.org?id=35eaf5a21dc776c9f7a880d0a4bf9ffc48213985#n3464