From cc51bd569874cd89a7fa1c3241033e69a5c2dd01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Fri, 21 Feb 2025 09:58:16 +0100 Subject: [PATCH 1/6] ; Skip image type test if support is missing * test/lisp/image-tests.el (image-type-from-file-name): Skip if image types are not available. (Bug#76462) --- test/lisp/image-tests.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el index 69557c83657..03d20758052 100644 --- a/test/lisp/image-tests.el +++ b/test/lisp/image-tests.el @@ -88,6 +88,9 @@ (should-not (image-supported-file-p "foo.some-unsupported-format"))) (ert-deftest image-type-from-file-name () + (skip-unless (and (image-type-available-p 'jpeg) + (image-type-available-p 'png) + (image-type-available-p 'webp))) (with-suppressed-warnings ((obsolete image-type-from-file-name)) (should (eq (image-type-from-file-name "foo.jpg") 'jpeg)) (should (eq (image-type-from-file-name "foo.png") 'png)) From 230ecb1e273e3fec6400cfad76e9b13f648d9055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Fri, 21 Feb 2025 10:36:52 +0100 Subject: [PATCH 2/6] ; Skip shr-test/zoom-image test if png or libxml support is missing * test/lisp/net/shr-tests.el (shr-test/zoom-image): Skip if png images or libxml are not supported. (Bug#76464) --- test/lisp/net/shr-tests.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/lisp/net/shr-tests.el b/test/lisp/net/shr-tests.el index beb9bfe85a9..8d66684c96d 100644 --- a/test/lisp/net/shr-tests.el +++ b/test/lisp/net/shr-tests.el @@ -135,7 +135,9 @@ settings, then once more for each (OPTION . VALUE) pair.") (ert-deftest shr-test/zoom-image () "Test that `shr-zoom-image' properly replaces the original image." - (skip-unless (bound-and-true-p image-types)) + (skip-unless (and (bound-and-true-p image-types) + (image-type-available-p 'png) + (fboundp 'libxml-parse-html-region))) (let* ((image (expand-file-name "data/image/blank-100x200.png" (getenv "EMACS_TEST_DIRECTORY"))) (image-url (concat "file://" (if (string-prefix-p "/" image) From f8ff9592be9181465740ee98b71513cdbcafc35f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Fri, 21 Feb 2025 09:15:50 +0100 Subject: [PATCH 3/6] ; Skip autorevert test when notify support is missing * test/lisp/autorevert-tests.el (auto-revert-test07-auto-revert-several-buffers): Skip if file notification support is not available. (Bug#76459) --- test/lisp/autorevert-tests.el | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el index 6f5e0192791..73fd5a66fa2 100644 --- a/test/lisp/autorevert-tests.el +++ b/test/lisp/autorevert-tests.el @@ -572,6 +572,8 @@ This expects `auto-revert--messages' to be bound by ;; This is inspired by Bug#44638, Bug#71424. (ert-deftest auto-revert-test07-auto-revert-several-buffers () "Check autorevert for several buffers visiting the same file." + (skip-unless (or file-notify--library + (file-remote-p temporary-file-directory))) ;; (with-auto-revert-test (ert-with-temp-file tmpfile (let ((auto-revert-use-notify t) From 76b938fc1d24b9dcc0c50db1dc520fbdacc19a16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ulrich=20M=C3=BCller?= Date: Fri, 21 Feb 2025 12:13:20 +0100 Subject: [PATCH 4/6] ; Don't fail image tests if jpeg is supported via imagemagick * test/lisp/image-tests.el (image-supported-file-p/optional): Consider also the imagemagick case. (Bug#76465) --- test/lisp/image-tests.el | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/lisp/image-tests.el b/test/lisp/image-tests.el index 03d20758052..455118cb98c 100644 --- a/test/lisp/image-tests.el +++ b/test/lisp/image-tests.el @@ -80,9 +80,12 @@ (should (eq (image-supported-file-p "foo.pbm") 'pbm))) (ert-deftest image-supported-file-p/optional () - (if (image-type-available-p 'jpeg) - (should (eq (image-supported-file-p "foo.jpg") 'jpeg)) - (should-not (image-supported-file-p "foo.jpg")))) + (cond ((image-type-available-p 'jpeg) + (should (eq (image-supported-file-p "foo.jpg") 'jpeg))) + ((fboundp 'imagemagick-types) + (should (eq (image-supported-file-p "foo.jpg") 'imagemagick))) + (nil + (should-not (image-supported-file-p "foo.jpg"))))) (ert-deftest image-supported-file-p/unsupported-returns-nil () (should-not (image-supported-file-p "foo.some-unsupported-format"))) From 443df12eddc66f4e2dbb14113b868f12419508bc Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Feb 2025 09:16:05 +0200 Subject: [PATCH 5/6] ; * INSTALL.REPO: Minor copyedits. --- INSTALL.REPO | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/INSTALL.REPO b/INSTALL.REPO index 6a6c7a2187b..0a687ce8d9e 100644 --- a/INSTALL.REPO +++ b/INSTALL.REPO @@ -15,6 +15,11 @@ example: $ make configure="--prefix=/opt/emacs CFLAGS='-O0 -g3'" +(We recommend the above CFLAGS if you want to build Emacs that will +be easy to debug. In addition, including --enable-checking=all in +the value of 'configure' above will turn on many run-time checks +that will identify problematic code sooner rather than later.) + If the above doesn't work, or if you have special build requirements, the following information may be helpful. @@ -25,8 +30,9 @@ autoconf - at least the version specified near the start of configure.ac (in the AC_PREREQ command). git - at least Git 1.7.1. If your repository was created by an older Git version, you may need to reclone it. -makeinfo - not strictly necessary, but highly recommended, so that - you can build the manuals. GNU Texinfo 4.13 or later should work. +makeinfo - required to build the manuals (whose Info files are not + in the repository). Installing GNU Texinfo 4.13 or later should + work. To use the autotools, run the following shell command to generate the 'configure' script and some related files, and to set up your git @@ -96,6 +102,9 @@ problem is known about and is just waiting for someone to fix it. This is especially true for Lisp compilation errors, which are almost never platform-specific. +If you need to debug Emacs, the instructions in 'etc/DEBUG' will help. +You can display that file in Emacs with 'C-h C-d', or just read it with +any program that can display text files, such as Less. Copyright (C) 2002-2025 Free Software Foundation, Inc. From 9c1d13c89a94685c0d1120d15e28bfb24e9644c3 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 22 Feb 2025 12:07:16 +0200 Subject: [PATCH 6/6] ; * admin/authors.el (authors-aliases): Add Vladimir Nikishkin. --- admin/authors.el | 1 + 1 file changed, 1 insertion(+) diff --git a/admin/authors.el b/admin/authors.el index f724e871056..946b1598f37 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -179,6 +179,7 @@ files.") ("Lars Magne Ingebrigtsen" "Lars Ingebrigtsen") ("Laurence Warne" "lWarne" "laurencewarne@gmail\\.com") (nil "lensplaysgames@gmail\\.com") + ("Vladimir Nikishkin" "lockywolf") (nil "lorniu@gmail\\.com") (nil "LynX@bk\\.ru") (nil "lu4nx")