Merge from origin/emacs-30

d66b8d4becb Fix checkbox's child creation
26c5fadf474 Document that 'package-vc' doesn't support built-in packages
ee61b9a050b ; Fix documentation of completion commands
ce43d13593a ; Simplify admin/run-codespell
fa1470d0699 ; Remove duplicated word in files.el Commentary
dabaea97465 Improve checkdoc-common-verbs-wrong-voice docstring
6de2ee5663d Document string-as-{unibyte,multibyte} as obsolete in manual
7f76f872ebf Fix go-ts-mode var spec indentation (Bug#75362)
01464fc882d Add "text" as a thing in tsx-ts-mode
59c57337923 Improve doc string of 'package-delete'
313a191d047 ; * admin/MAINTAINERS: Remove Kelvin White.
002960ceabf Clarify that 'mac' line ending convention is not used on ...
4210e065648 Add language server for Odin
ee1034422b0 ; Improve documentation of function-type display
1c49edc4080 Modernize "Commentary" section of files.el
505c1123e18 * INSTALL: Add advice how to invoke 'make install'.  (Bug...
82e16cae9cc Improve the documentation of 'key-valid-p'

# Conflicts:
#	etc/NEWS
#	lisp/progmodes/typescript-ts-mode.el

2 files changed, 17 insertions, 22 deletions

diff --git a/admin/MAINTAINERS b/admin/MAINTAINERS
index 413a587d398..ca20562d8a5 100644
--- a/admin/MAINTAINERS
+++ b/admin/MAINTAINERS
@@ -256,11 +256,6 @@ maintainership to someone listed above, but who want to continue to be
 CC'd as though they were still the primary maintainer, in the meantime.
 ==============================================================================
 
-Kelvin White
-       ERC
-           lisp/erc/*
-           doc/misc/erc.texi
-
 Eli Zaretskii
         doc/*
 
diff --git a/admin/run-codespell b/admin/run-codespell
index be90313da1e..f5728f831f0 100755
--- a/admin/run-codespell
+++ b/admin/run-codespell
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ### run-codespell - run codespell on Emacs
 
 ## Copyright (C) 2023-2025 Free Software Foundation, Inc.
@@ -40,22 +40,22 @@ CODESPELL_DICTIONARY="${CODESPELL_DIR}/codespell.dictionary"
 emacs_run_codespell ()
 {
     git ls-files |\
-        grep -v -E -e '^(lib|m4)/.*' |\
-        grep -v -E -e '^admin/(charsets|codespell|unidata)/.*' |\
-        grep -v -E -e '^doc/lispref/spellfile$' |\
-        grep -v -E -e '^doc/misc/texinfo.tex$' |\
-        grep -v -E -e '^doc/translations/.*' |\
-        grep -v -E -e '^etc/(AUTHORS|HELLO|publicsuffix.txt)$' |\
-        grep -v -E -e '^etc/refcards/(cs|de|fr|pl|pt|sk)-.+.tex$' |\
-        grep -v -E -e '^etc/tutorials/TUTORIAL\..+' |\
-        grep -v -E -e '^leim/(MISC|SKK)-DIC/.*' |\
-        grep -v -E -e '^lisp/language/ethio-util.el' |\
-        grep -v -E -e '^lisp/ldefs-boot.el' |\
-        grep -v -E -e '^lisp/leim/.*' |\
-        grep -v -E -e '^test/lisp/erc/resources/.*' |\
-        grep -v -E -e '^test/lisp/net/puny-resources/IdnaTestV2.txt' |\
-        grep -v -E -e '^test/manual/(etags|indent)/.*' |\
-        grep -v -E -e '^test/src/regex-resources/.*' |\
+        grep --line-buffered -v -E -e "^(lib|m4)/.*|\
+^admin/(charsets|codespell|unidata)/.*|\
+^doc/lispref/spellfile$|\
+^doc/misc/texinfo.tex$|\
+^doc/translations/.*|\
+^etc/(AUTHORS|HELLO|publicsuffix.txt)$|\
+^etc/refcards/(cs|de|fr|pl|pt|sk)-.+.tex$|\
+^etc/tutorials/TUTORIAL\..+|\
+^leim/(MISC|SKK)-DIC/.*|\
+^lisp/language/ethio-util.el|\
+^lisp/ldefs-boot.el|\
+^lisp/leim/.*|\
+^test/lisp/erc/resources/.*|\
+^test/lisp/net/puny-resources/IdnaTestV2.txt|\
+^test/manual/(etags|indent)/.*|\
+^test/src/regex-resources/.*" |\
         xargs codespell \
               --config "$CODESPELL_RC" \
               --exclude-file "$CODESPELL_EXCLUDE" \