From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements Date: Sun, 07 May 2023 09:58:19 +0000 Message-ID: <87cz3cea4k.fsf@posteo.net> References: <87fs89qg9y.fsf@breatheoutbreathe.in> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2664"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 63337@debbugs.gnu.org To: Joseph Turner Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun May 07 11:59:12 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 1pvbAd-0000Tx-3A for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 07 May 2023 11:59:11 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pvbAW-0005nW-My; Sun, 07 May 2023 05:59:04 -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 1pvbAU-0005nI-Hc for bug-gnu-emacs@gnu.org; Sun, 07 May 2023 05:59:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pvbAU-0007QT-3X for bug-gnu-emacs@gnu.org; Sun, 07 May 2023 05:59:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pvbAT-0005Bp-PY for bug-gnu-emacs@gnu.org; Sun, 07 May 2023 05:59:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 07 May 2023 09:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63337 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 63337-submit@debbugs.gnu.org id=B63337.168345351219909 (code B ref 63337); Sun, 07 May 2023 09:59:01 +0000 Original-Received: (at 63337) by debbugs.gnu.org; 7 May 2023 09:58:32 +0000 Original-Received: from localhost ([127.0.0.1]:36515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvb9z-0005B3-MO for submit@debbugs.gnu.org; Sun, 07 May 2023 05:58:32 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]:45819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pvb9u-0005Am-Sr for 63337@debbugs.gnu.org; Sun, 07 May 2023 05:58:30 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id AD2E924010D for <63337@debbugs.gnu.org>; Sun, 7 May 2023 11:58:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1683453500; bh=ecQgixmZUq9iT57EuiFoSb1W7pLHN+SmiS97ooR3AsI=; h=From:To:Cc:Subject:Autocrypt:Date:From; b=GCxr/oq3FTagI/k83jbl7kBxIAX7jnd4l05+u+nbYiNRbaJh0jfJnZMu7efssiDSn ejIjzJYz3I4+FkzcUC8fn8xgDriU9Vdl+G1OS5IjnoutNb9sAcGzI4XQ5RJgtYfNlU 1w3iPdmSDrLdTgAEPvgoJ8YfT0jDpJpJBWldZEQCE5gL7UUvSRt16vNugskvwoAS0D PsEyqYqxgokGvelVBKsNVsdlqD4UFIhR5LQTvlJ7KsFDBDJeMtdsamSvSoNNt9JM5V 246QqlI8dajeTmJbEw8FGIB6FTmPBv5zLkco+Ukm/JDkmCBrKW1fgcPSel+l8xs2Gv rJIukqQiwv+rw== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QDfxl6Mp0z9rxD; Sun, 7 May 2023 11:58:19 +0200 (CEST) In-Reply-To: <87fs89qg9y.fsf@breatheoutbreathe.in> (Joseph Turner's message of "Sat, 06 May 2023 13:54:49 -0700") Autocrypt: addr=philipk@posteo.net; keydata= mDMEZBBQQhYJKwYBBAHaRw8BAQdAHJuofBrfqFh12uQu0Yi7mrl525F28eTmwUDflFNmdui0QlBo aWxpcCBLYWx1ZGVyY2ljIChnZW5lcmF0ZWQgYnkgYXV0b2NyeXB0LmVsKSA8cGhpbGlwa0Bwb3N0 ZW8ubmV0PoiWBBMWCAA+FiEEDg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwMFCQHhM4AFCwkI BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ8xYDWXahwulikAEA77hloUiSrXgFkUVJhlKBpLCHUjA0 mWZ9j9w5d08+jVwBAK6c4iGP7j+/PhbkxaEKa4V3MzIl7zJkcNNjHCXmvFcEuDgEZBBQQhIKKwYB BAGXVQEFAQEHQI5NLiLRjZy3OfSt1dhCmFyn+fN/QKELUYQetiaoe+MMAwEIB4h+BBgWCAAmFiEE Dg7HY17ghYlni8XN8xYDWXahwukFAmQQUEICGwwFCQHhM4AACgkQ8xYDWXahwukm+wEA8cml4JpK NeAu65rg+auKrPOP6TP/4YWRCTIvuYDm0joBALw98AMz7/qMHvSCeU/hw9PL6u6R2EScxtpKnWof z4oM 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:261247 Archived-At: Joseph Turner writes: > Hello! > > Because package-vc--build-documentation exports the texinfo manual to a > temp file inside /tmp/ , any @include statements with relative paths > break the makeinfo call. > > I noticed this issue when attempting to use package-vc to install > org-transclusion, whose manual contains the line > > #+texinfo: @include fdl.texi > > See: https://raw.githubusercontent.com/nobiot/org-transclusion/main/docs/org-transclusion-manual.org > > The attached patch solves this problem by passing the -I flag to > makeinfo. From makeinfo --help: > > -I DIR append DIR to the @include search path. Good catch, this should be applied to emacs-29. > Best, > > Joseph > > From a41abce88ed3b833c5531208945474c9cd16284b Mon Sep 17 00:00:00 2001 > From: Joseph Turner > Date: Sat, 6 May 2023 14:49:43 -0700 > Subject: [PATCH] Fix: (package-vc--build-documentation) Relative @include > statements > > --- > lisp/emacs-lisp/package-vc.el | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el > index 489610e2a1e..63c10285ca7 100644 > --- a/lisp/emacs-lisp/package-vc.el > +++ b/lisp/emacs-lisp/package-vc.el > @@ -381,6 +381,7 @@ FILE can be an Org file, indicated by its \".org\" extension, > otherwise it's assumed to be an Info file." > (let* ((pkg-name (package-desc-name pkg-desc)) > (default-directory (package-desc-dir pkg-desc)) > + (docs-directory (expand-file-name (file-name-directory file))) > (output (expand-file-name (format "%s.info" pkg-name))) > clean-up) > (when (string-match-p "\\.org\\'" file) > @@ -395,7 +396,9 @@ otherwise it's assumed to be an Info file." > (erase-buffer) > (cond > ((/= 0 (call-process "makeinfo" nil t nil > - "--no-split" file "-o" output)) > + "-I" docs-directory According to the docs, makeinfo has -I to append the search path, and -P to prepend. I don't know how well either of the two are supported, but assuming they are, shouldn't -P be preferred? Or wouldn't it have any effect? > + "--no-split" file > + "-o" output)) > (message "Failed to build manual %s, see buffer %S" > file (buffer-name))) > ((/= 0 (call-process "install-info" nil t nil -- Philip Kaludercic