From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Joseph Turner via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#65243: [PATCH] Fix building of VC package manuals with relative org links/includes Date: Sat, 12 Aug 2023 01:43:35 -0700 Message-ID: <87y1ig3atl.fsf@breatheoutbreathe.in> Reply-To: Joseph Turner Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="24258"; mail-complaints-to="usenet@ciao.gmane.io" Cc: philipk@posteo.net To: 65243@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Aug 12 10:50:25 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qUkKH-00064U-E4 for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 12 Aug 2023 10:50:25 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qUkJx-0003ik-W9; Sat, 12 Aug 2023 04:50:06 -0400 Original-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 1qUkJv-0003iX-5l for bug-gnu-emacs@gnu.org; Sat, 12 Aug 2023 04:50:03 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qUkJu-0002hb-Su for bug-gnu-emacs@gnu.org; Sat, 12 Aug 2023 04:50:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qUkJu-0007aQ-PH for bug-gnu-emacs@gnu.org; Sat, 12 Aug 2023 04:50:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Joseph Turner Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 12 Aug 2023 08:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65243 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.169183015929094 (code B ref -1); Sat, 12 Aug 2023 08:50:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 12 Aug 2023 08:49:19 +0000 Original-Received: from localhost ([127.0.0.1]:48686 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUkJD-0007ZC-FK for submit@debbugs.gnu.org; Sat, 12 Aug 2023 04:49:19 -0400 Original-Received: from lists.gnu.org ([2001:470:142::17]:54486) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qUkJB-0007Yv-22 for submit@debbugs.gnu.org; Sat, 12 Aug 2023 04:49:17 -0400 Original-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 1qUkJ5-0003f4-8S for bug-gnu-emacs@gnu.org; Sat, 12 Aug 2023 04:49:11 -0400 Original-Received: from out-69.mta1.migadu.com ([95.215.58.69]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qUkJ2-0002WR-9A for bug-gnu-emacs@gnu.org; Sat, 12 Aug 2023 04:49:10 -0400 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=breatheoutbreathe.in; s=key1; t=1691830141; 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; bh=+KSukob+Fc3nn+KnA7jc4FVpCiq9ffTl0TX/0OiySz4=; b=Kw38D/OGxLgyKUTZYhTf1OHi/DPZxl179EA4/Iv9HvVjn/IFRJ6leErxiOHiJo5NPCsICC x0upPo8gAtE9yVvEjBMy4Aplt2esT5EY502HxWG7xBvaG8BRzTSK5ziLm6/o3CFusULO/G 5hH2ewTRiMFQvflZY6VF7aFC/+VBgOc= X-Migadu-Flow: FLOW_OUT Received-SPF: pass client-ip=95.215.58.69; envelope-from=joseph@breatheoutbreathe.in; helo=out-69.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 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:267289 Archived-At: --=-=-= Content-Type: text/plain Hello, This patch allows for relative includes and link in org files compiled to texinfo. Unfortunately, I missed this back in May (commit 1e6a7594 ), when we fixed relative texi @include links. I'm not sure how the Emacs release cycle works. Would it be possible to include this fix in 29.2? Best, Joseph --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Fix-building-of-VC-package-manuals-with-relative-org.patch >From e951b0ea4ffa90202ecee934eddd895b706c6794 Mon Sep 17 00:00:00 2001 From: Joseph Turner Date: Sat, 12 Aug 2023 01:40:07 -0700 Subject: [PATCH] Fix building of VC package manuals with relative org links/includes * lisp/emacs-lisp/package-vc.el (package-vc--build-documentation): Ensure that default-default is the docs-directory around org-export-to-file to ensure that links to relative files work correctly. --- lisp/emacs-lisp/package-vc.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el index b4c911015b5..ffc7afeb2ee 100644 --- a/lisp/emacs-lisp/package-vc.el +++ b/lisp/emacs-lisp/package-vc.el @@ -356,7 +356,8 @@ otherwise it's assumed to be an Info file." (with-temp-buffer (insert-file-contents file) (setq file (make-temp-file "ox-texinfo-")) - (org-export-to-file 'texinfo file) + (let ((default-directory docs-directory)) + (org-export-to-file 'texinfo file)) (setq clean-up t))) (with-current-buffer (get-buffer-create " *package-vc doc*") (erase-buffer) -- 2.41.0 --=-=-=--