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