[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#63337: [PATCH] package-vc--build-documentation: Fix relative @includ
From: |
Philip Kaludercic |
Subject: |
bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements |
Date: |
Mon, 08 May 2023 13:51:23 +0000 |
Joseph Turner <joseph@breatheoutbreathe.in> writes:
> Philip Kaludercic <philipk@posteo.net> writes:
>
>> Eli Zaretskii <eliz@gnu.org> writes:
>>
>>>> Cc: 63337@debbugs.gnu.org
>>>> Date: Sun, 07 May 2023 11:40:46 -0700
>>>> From: Joseph Turner via "Bug reports for GNU Emacs,
>>>> the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
>>>>
>>>> > 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?
>>>>
>>>> I am not sure what difference it would make. I don't know if the default
>>>> @include search path includes anything besides the working directory.
>>
>> I don't know that either, and I can imagine that certain versions of
>> makeinfo might be patched or this could change in the future.
>>
>>> It doesn't, according to the Texinfo manual. Only the current
>>> directory is searched.
>>>
>>>> In the attached diff, I have changed -I to -P.
>>>
>>> I think it's a mistake: the current directory should searched first.
>>> So -I is better.
>>
>> What do we mean by the current directory? When building the manual from
>> an org-file, we switch to a temporary directory (where the .org -> .texi
>> conversion is stored), so the "actual" directory is not the same as the
>> default-directory.
>
> AFAICT, makeinfo searches the default-directory. See attached patch,
> where we let-bind default-directory to the docs-directory. In this case,
> neither -I nor -P is necessary.
>
> It's a bit strange to let-bind default-directory twice in the same
> function, but we can't bind it at the top of the function, the
> insert-file-contents expects default-directory to be package-desc-dir.
It might be, but I'll have to look into that in more detail, that the
first default-directory binding is not necessary if we pass
(package-desc-dir pkg-desc) as the second argument to `expand-file-name'
when binding `output'. Then this would all be simplified, and we could
avoid the confusion you mention.
> Joseph
>
> From 7ddfd7ab08820eef159b21047194aaaf4c8841f7 Mon Sep 17 00:00:00 2001
> From: Joseph Turner <joseph@breatheoutbreathe.in>
> 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 | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
> diff --git a/lisp/emacs-lisp/package-vc.el b/lisp/emacs-lisp/package-vc.el
> index 476c38916a8..c25a96ed942 100644
> --- a/lisp/emacs-lisp/package-vc.el
> +++ b/lisp/emacs-lisp/package-vc.el
> @@ -377,6 +377,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)
> @@ -389,16 +390,18 @@ otherwise it's assumed to be an Info file."
> (setq clean-up t)))
> (with-current-buffer (get-buffer-create " *package-vc doc*")
> (erase-buffer)
> - (cond
> - ((/= 0 (call-process "makeinfo" nil t nil
> - "--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
> - output (expand-file-name "dir")))
> - (message "Failed to install manual %s, see buffer %S"
> - output (buffer-name)))
> - ((kill-buffer))))
> + (let ((default-directory docs-directory))
> + ;; `let'-bind `default-directory' so that makeinfo resolves
> + ;; relative @include statements in the docs directory
> + (cond
> + ((/= 0 (call-process "makeinfo" nil t nil "--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
> + output (expand-file-name "dir")))
> + (message "Failed to install manual %s, see buffer %S"
> + output (buffer-name)))
> + ((kill-buffer)))))
> (when clean-up
> (delete-file file))))
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Joseph Turner, 2023/05/06
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Philip Kaludercic, 2023/05/07
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Eli Zaretskii, 2023/05/07
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Joseph Turner, 2023/05/07
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Eli Zaretskii, 2023/05/07
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Philip Kaludercic, 2023/05/07
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Joseph Turner, 2023/05/07
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements,
Philip Kaludercic <=
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Joseph Turner, 2023/05/08
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Ruijie Yu, 2023/05/08
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Joseph Turner, 2023/05/08
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Eli Zaretskii, 2023/05/09
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Joseph Turner, 2023/05/09
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Philip Kaludercic, 2023/05/10
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Joseph Turner, 2023/05/10
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Philip Kaludercic, 2023/05/12
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Eli Zaretskii, 2023/05/12
- bug#63337: [PATCH] package-vc--build-documentation: Fix relative @include statements, Philip Kaludercic, 2023/05/12