Merge from origin/emacs-30

9b3eb06c76 Indent jsx_text properly with modern grammars
1c87be8ac9 ; * lisp/gnus/gnus.el (gnus-summary-line-format): Reindent.

lisp/gnus/gnus.el

@@ -2718,64 +2718,64 @@ are always t.")
 It works along the same lines as a normal formatting string,
 with some simple extensions.
 
-%N          Article number, left padded with spaces (string)
+%N           Article number, left padded with spaces (string)
-%S          Subject (string)
+%S           Subject (string)
-%s          Subject if it is at the root of a thread, and \"\"
+%s           Subject if it is at the root of a thread, and \"\"
-            otherwise (string)
+             otherwise (string)
-%n          Name of the poster (string)
+%n           Name of the poster (string)
-%a          Extracted name of the poster (string)
+%a           Extracted name of the poster (string)
-%A          Extracted address of the poster (string)
+%A           Extracted address of the poster (string)
-%F          Contents of the From: header (string)
+%F           Contents of the From: header (string)
-%f          Contents of the From: or To: headers (string)
+%f           Contents of the From: or To: headers (string)
-%x          Contents of the Xref: header (string)
+%x           Contents of the Xref: header (string)
-%D          Contents of the Date: header article (string)
+%D           Contents of the Date: header article (string)
-%d          Date of the article (string) in DD-MMM format
+%d           Date of the article (string) in DD-MMM format
-%o          Date of the article (string) in YYYYMMDD`T'HHMMSS
+%o           Date of the article (string) in YYYYMMDD`T'HHMMSS
-            format
+             format
-%M          Message-id of the article (string)
+%M           Message-id of the article (string)
-%r          References of the article (string)
+%r           References of the article (string)
-%c          Number of characters in the article (integer)
+%c           Number of characters in the article (integer)
-%k          Pretty-printed version of the above (string)
+%k           Pretty-printed version of the above (string)
-            For example, \"1.2k\" or \"0.4M\".
+             For example, \"1.2k\" or \"0.4M\".
-%L          Number of lines in the article (integer)
+%L           Number of lines in the article (integer)
-%Z          RSV of the article; nil if not in an nnselect group (integer)
+%Z           RSV of the article; nil if not in an nnselect group (integer)
-%G          Originating group name for the article; nil if not
+%G           Originating group name for the article; nil if not
-            in an nnselect group (string)
+             in an nnselect group (string)
-%g          Short from  of the originating group name for the article;
+%g           Short from  of the originating group name for the article;
-            nil if not in an nnselect group (string)
+             nil if not in an nnselect group (string)
-%I          Indentation based on thread level (a string of
+%I           Indentation based on thread level (a string of
-            spaces)
+             spaces)
-%B          A complex trn-style thread tree (string)
+%B           A complex trn-style thread tree (string)
-            The variables `gnus-sum-thread-*' can be used for
+             The variables `gnus-sum-thread-*' can be used for
-            customization.
+             customization.
-%T          A string with two possible values: 80 spaces if the
+%T           A string with two possible values: 80 spaces if the
-            article is on thread level two or larger and 0 spaces
+             article is on thread level two or larger and 0 spaces
-            on level one
+             on level one
-%R          \"A\" if this article has been replied to, \" \"
+%R           \"A\" if this article has been replied to, \" \"
-            otherwise (character)
+             otherwise (character)
-%U          \"Read\" status of this article.
+%U           \"Read\" status of this article.
-            See Info node `(gnus)Marking Articles'
+             See Info node `(gnus)Marking Articles'
-%[          Opening bracket (character, \"[\" or \"<\")
+%[           Opening bracket (character, \"[\" or \"<\")
-%]          Closing bracket (character, \"]\" or \">\")
+%]           Closing bracket (character, \"]\" or \">\")
-%>          Spaces of length thread-level (string)
+%>           Spaces of length thread-level (string)
-%<          Spaces of length (- 20 thread-level) (string)
+%<           Spaces of length (- 20 thread-level) (string)
-%i          Article score (number)
+%i           Article score (number)
-%z          Article zcore (character)
+%z           Article zcore (character)
-%t          Number of articles under the current thread (number).
+%t           Number of articles under the current thread (number).
-%e          Whether the thread is empty or not (character).
+%e           Whether the thread is empty or not (character).
-%V          Total thread score (number).
+%V           Total thread score (number).
-%P          The line number (number).
+%P           The line number (number).
-%O          Download mark (character).
+%O           Download mark (character).
-%*          If present, indicates desired cursor position
+%*           If present, indicates desired cursor position
-            (instead of after first colon).
+             (instead of after first colon).
-%u          User defined specifier.  The next character in the
+%u           User defined specifier.  The next character in the
-            format string should be a letter.  Gnus will call the
+             format string should be a letter.  Gnus will call the
-            function gnus-user-format-function-X, where X is the
+             function gnus-user-format-function-X, where X is the
-            letter following %u.  The function will be passed the
+             letter following %u.  The function will be passed the
-            current header as argument.  The function should
+             current header as argument.  The function should
-            return a string, which will be inserted into the
+             return a string, which will be inserted into the
-            summary just like information from any other summary
+             summary just like information from any other summary
-            specifier.
+             specifier.
 %&user-date; Age sensitive date format.  Various date format is
              defined in `gnus-user-date-format-alist'.
 

lisp/progmodes/js.el

@@ -3449,7 +3449,7 @@ Check if a node type is available, then return the right indent rules."
                ((parent-is "jsx_fragment") parent js-indent-level)))
     (error
      `(((match "<" "jsx_text") parent 0)
-       ((parent-is "jsx_text") parent js-indent-level)))))
+       ((parent-is "jsx_text") parent-bol js-indent-level)))))
 
 (defun js--treesit-switch-body-helper (_node parent _bol &rest _args)
   "Anchor helper for the switch body..

lisp/progmodes/typescript-ts-mode.el

@@ -141,7 +141,7 @@ Check if a node type is available, then return the right indent rules."
                ((parent-is "jsx_fragment") parent typescript-ts-mode-indent-offset)))
     (treesit-query-error
      `(((match "<" "jsx_text") parent 0)
-       ((parent-is "jsx_text") parent typescript-ts-mode-indent-offset)))))
+       ((parent-is "jsx_text") parent-bol typescript-ts-mode-indent-offset)))))
 
 (defun typescript-ts-mode--anchor-decl (_n parent &rest _)
   "Return the position after the declaration keyword before PARENT.