master 314f12630af: Merge from origin/emacs-29

[Stefan Kangas]

branch: master
commit 314f12630af4d085d0c07283f110ad15b07bde14
Merge: 8051be9ac20 2550e8bb0b0
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Merge from origin/emacs-29
    
    2550e8bb0b0 Fix mule-tests under en_US.UTF-8 locale
    32795309939 Move block closer above declaration_list rule (bug#61531)
    b18754bb179 Minor improvements in c-ts-mode and docs
    3c6b726a7b4 Add super node as a keyword
    1917c51fe68 ; Prevent ERC-induced false positive in JUnit report
    b16965ef7e6 Delete perplexing paragraph from Gnus manual
    43c62a4732d ; Fix typo
---
 doc/emacs/programs.texi                 | 13 ++++++++-----
 doc/misc/gnus.texi                      |  9 ---------
 lisp/international/mule.el              |  1 +
 lisp/progmodes/c-ts-mode.el             | 11 ++++++-----
 lisp/progmodes/java-ts-mode.el          |  3 ++-
 lisp/progmodes/rust-ts-mode.el          |  2 +-
 test/lisp/erc/erc-scenarios-internal.el |  3 +++
 test/lisp/international/mule-tests.el   |  2 +-
 8 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi
index d983c2b59c6..d97bd56be21 100644
--- a/doc/emacs/programs.texi
+++ b/doc/emacs/programs.texi
@@ -619,15 +619,18 @@ declaration (@code{c-indent-defun} in CC mode,
 @kindex C-M-q @r{(C mode)}
 @findex c-indent-exp
 @findex prog-indent-sexp
-Reindent each line in the balanced expression that follows point.  In
-CC mode, this invokes @code{c-indent-exp}; in tree-sitter based
-@code{c-ts-mode} this invokes a more general @code{prog-indent-sexp}.
-A prefix argument inhibits warning messages about invalid syntax.
+Reindent each line in the balanced expression (@pxref{Expressions}),
+also known as ``sexp'', that follows point.  In CC mode, this invokes
+@code{c-indent-exp}; in tree-sitter based @code{c-ts-mode} this
+invokes a more general @code{prog-indent-sexp}.  A prefix argument
+inhibits warning messages about invalid syntax.
 
 @item @key{TAB}
 @findex c-indent-line-or-region
 Reindent the current line, active region, or block starting on this
-line (@code{c-indent-line-or-region}).
+line (@code{c-indent-line-or-region}).  With prefix argument, rigidly
+reindent the balanced expression which starts on the current line, if
+the current line needs reindentation.
 
 @vindex c-tab-always-indent
 If @code{c-tab-always-indent} is @code{t}, this command always reindents
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi
index 1769b70c9bc..486171a080a 100644
--- a/doc/misc/gnus.texi
+++ b/doc/misc/gnus.texi
@@ -3853,15 +3853,6 @@ The dribble file will be saved, though (@pxref{Auto 
Save}).
 @code{gnus-after-exiting-gnus-hook} is called as the final item when
 exiting Gnus.
 
-Note:
-
-@quotation
-Miss Lisa Cannifax, while sitting in English class, felt her feet go
-numbly heavy and herself fall into a hazy trance as the boy sitting
-behind her drew repeated lines with his pencil across the back of her
-plastic chair.
-@end quotation
-
 
 @node Group Topics
 @section Group Topics
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 52019697ad7..25b90b49c8f 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -2544,6 +2544,7 @@ This function is intended to be added to 
`auto-coding-functions'."
                        ;; coding-system-equal, since it isn't a
                        ;; coding-system.  So test that up front.
                        (not (equal sym-type 'charset))
+                       (not (equal bfcs-type 'charset))
                        (coding-system-equal 'utf-8 sym-type)
                        (coding-system-equal 'utf-8 bfcs-type))
                   buffer-file-coding-system
diff --git a/lisp/progmodes/c-ts-mode.el b/lisp/progmodes/c-ts-mode.el
index 40b258bddf9..38aaea139f1 100644
--- a/lisp/progmodes/c-ts-mode.el
+++ b/lisp/progmodes/c-ts-mode.el
@@ -267,15 +267,15 @@ MODE is either `c' or `cpp'."
            ((query "(for_statement update: (_) @indent)") parent-bol 5)
            ((query "(call_expression arguments: (_) @indent)") parent 
c-ts-mode-indent-offset)
            ((parent-is "call_expression") parent 0)
+           ;; Closing bracket.  This should be before initializer_list
+           ;; (and probably others) rule because that rule (and other
+           ;; similar rules) will match the closing bracket.  (Bug#61398)
+           ((node-is "}") point-min c-ts-common-statement-offset)
            ,@(when (eq mode 'cpp)
                '(((node-is "access_specifier") parent-bol 0)
                  ;; Indent the body of namespace definitions.
                  ((parent-is "declaration_list") parent-bol 
c-ts-mode-indent-offset)))
 
-           ;; Closing bracket.  This should be before initializer_list
-           ;; (and probably others) rule because that rule (and other
-           ;; similar rules) will match the closing bracket.  (Bug#61398)
-           ((node-is "}") point-min c-ts-common-statement-offset)
 
            ;; int[5] a = { 0, 0, 0, 0 };
            ((parent-is "initializer_list") parent-bol c-ts-mode-indent-offset)
@@ -738,7 +738,8 @@ the semicolon.  This function skips the semicolon."
   :doc "Keymap for C and C-like languages with tree-sitter"
   :parent prog-mode-map
   "C-c C-q" #'c-ts-mode-indent-defun
-  "C-c ." #'c-ts-mode-set-style)
+  "C-c ." #'c-ts-mode-set-style
+  "C-c C-c" #'comment-region)
 
 ;;;###autoload
 (define-derived-mode c-ts-base-mode prog-mode "C"
diff --git a/lisp/progmodes/java-ts-mode.el b/lisp/progmodes/java-ts-mode.el
index f69c0768a3d..0560cc33244 100644
--- a/lisp/progmodes/java-ts-mode.el
+++ b/lisp/progmodes/java-ts-mode.el
@@ -162,7 +162,8 @@
    :override t
    :feature 'keyword
    `([,@java-ts-mode--keywords
-      (this)] @font-lock-keyword-face
+      (this)
+      (super)] @font-lock-keyword-face
       (labeled_statement
        (identifier) @font-lock-keyword-face))
    :language 'java
diff --git a/lisp/progmodes/rust-ts-mode.el b/lisp/progmodes/rust-ts-mode.el
index f510b7bb6c9..ec823d09d8c 100644
--- a/lisp/progmodes/rust-ts-mode.el
+++ b/lisp/progmodes/rust-ts-mode.el
@@ -293,7 +293,7 @@
    '((field_identifier) @font-lock-property-face
      (shorthand_field_initializer (identifier) @font-lock-property-face))
 
-   ;; Must be under type, otherwise some imports can be highlighted as 
consants.
+   ;; Must be under type, otherwise some imports can be highlighted as 
constants.
    :language 'rust
    :feature 'constant
    `((boolean_literal) @font-lock-constant-face
diff --git a/test/lisp/erc/erc-scenarios-internal.el 
b/test/lisp/erc/erc-scenarios-internal.el
index 8d38c2dde49..18eb94e24b0 100644
--- a/test/lisp/erc/erc-scenarios-internal.el
+++ b/test/lisp/erc/erc-scenarios-internal.el
@@ -21,6 +21,9 @@
 
 (require 'ert-x)
 (eval-and-compile
+  (when (and (getenv "EMACS_TEST_DIRECTORY")
+             (getenv "EMACS_TEST_JUNIT_REPORT"))
+    (setq ert-load-file-name (or (macroexp-file-name) buffer-file-name)))
   (let ((load-path (cons (expand-file-name "erc-d" (ert-resource-directory))
                          load-path)))
     (load "erc-d-tests" nil 'silent)))
diff --git a/test/lisp/international/mule-tests.el 
b/test/lisp/international/mule-tests.el
index 6e23d8c5421..6b76e35ae22 100644
--- a/test/lisp/international/mule-tests.el
+++ b/test/lisp/international/mule-tests.el
@@ -99,7 +99,7 @@ provide HTML fragments.  Some tests override those variables."
 
 (ert-deftest sgml-html-meta-utf-8 ()
   "Baseline: UTF-8."
-  (should (eq 'utf-8 (sgml-html-meta-run "utf-8"))))
+  (should (eq 'utf-8 (coding-system-base (sgml-html-meta-run "utf-8")))))
 
 (ert-deftest sgml-html-meta-windows-hebrew ()
   "A non-Unicode charset."