diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2024-01-13 20:38:34 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2024-01-13 20:38:34 +0200 |
| commit | 1f97a8787957e49f1893b9ac73c95228f6ac1a13 (patch) | |
| tree | 12a63d3936e8e64f299442a56b1d7c5e0cd1cec2 | |
| parent | c494a6e879dfeecb0cec3e9ae7bc0d3c682a9185 (diff) | |
| download | emacs-1f97a8787957e49f1893b9ac73c95228f6ac1a13.tar.gz emacs-1f97a8787957e49f1893b9ac73c95228f6ac1a13.tar.bz2 emacs-1f97a8787957e49f1893b9ac73c95228f6ac1a13.zip | |
Fix info-xref-tests
* doc/lispintro/emacs-lisp-intro.texi (How let Binds Variables):
Fix cross-reference. (Bug#68428)
* test/lisp/info-xref-tests.el (info-xref-test-write-file): Fix
test on MS-Windows when run from MSYS Bash.
| -rw-r--r-- | doc/lispintro/emacs-lisp-intro.texi | 2 | ||||
| -rw-r--r-- | test/lisp/info-xref-tests.el | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index b3fe8ce4589..a06822ce539 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -3769,7 +3769,7 @@ the first line of your Emacs Lisp file: ;;; -*- lexical-binding: t -*- @end example -For more information about this, @pxref{Selecting Lisp Dialect, , , +For more information about this, @pxref{Variable Scoping, , , elisp, The Emacs Lisp Reference Manual}. @menu diff --git a/test/lisp/info-xref-tests.el b/test/lisp/info-xref-tests.el index 72b6706a22c..c8eb18501f3 100644 --- a/test/lisp/info-xref-tests.el +++ b/test/lisp/info-xref-tests.el @@ -92,7 +92,15 @@ text. " ) (write-region nil nil file nil 'silent)) - (should (equal 0 (call-process "makeinfo" file)))) + (if (and (eq system-type 'windows-nt) + (executable-find "sh")) + ;; If we are running from MSYS Bash, makeinfo.bat might find the + ;; wrong version of Perl, so make sure to run the shell script + ;; named just 'makeinfo' instead, because it names the correct + ;; Perl. + (should (equal 0 (call-process "sh" nil t nil + "-c" (format "makeinfo '%s'" file)))) + (should (equal 0 (call-process "makeinfo" file))))) (ert-deftest info-xref-test-makeinfo () "Test that info-xref can parse basic makeinfo output." |