From: Stefan Kangas <stefan@marxist.se>
Date: Mon, 6 Dec 2021 05:47:44 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~3612^2^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=013161d4a77658c501c05aa754d36164fceb3982;p=emacs.git

Merge from origin/emacs-28

e3427faf55 Fix typos and improve consistency in ERC manual
0bf10d5082 * test/Makefile.in (check-declare): Add missing --batch.
34f5656137 Document the subtleties of the 'cursor' text property
---

013161d4a77658c501c05aa754d36164fceb3982
diff --cc test/Makefile.in
index 51696d7faaf,bb32ef672db..f2c49584e7f
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@@ -368,16 -360,5 +368,16 @@@ maintainer-clean: distclean bootstrap-c
  .PHONY: check-declare
  
  check-declare:
- 	$(emacs) -l check-declare \
+ 	$(emacs) --batch -l check-declare \
  	  --eval '(check-declare-directory "$(srcdir)")'
 +
 +.PHONY: subdirs subdir-targets generate-test-jobs
 +
 +subdirs:
 +	@echo $(SUBDIRS)
 +
 +subdir-targets:
 +	@echo $(SUBDIR_TARGETS)
 +
 +generate-test-jobs:
 +	@$(MAKE) -C infra generate-test-jobs SUBDIRS="$(SUBDIRS)"