From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 17 Sep 2023 05:26:46 +0000 (-0400)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d2f6a5c59a298f87b6002267529dcecb02e44421;p=emacs.git

Merge from origin/emacs-29

bcf287bd114 typescript-ts-mode.el: Minor touches
67c82710764 Improve namespacing situation WRT to recent change in typ...
33ff4fed03d Make move-end-of-line in minibuffer consistent (bug#65980)
---

d2f6a5c59a298f87b6002267529dcecb02e44421
diff --cc lisp/progmodes/typescript-ts-mode.el
index 7c85a7b6fe9,709d3718a0a..01a021c64fc
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@@ -368,55 -369,11 +369,57 @@@ Argument LANGUAGE is either `typescript
     :override t
     '((escape_sequence) @font-lock-escape-face)))
  
 +(defvar typescript-ts-mode--sentence-nodes
 +  '("import_statement"
 +    "debugger_statement"
 +    "expression_statement"
 +    "if_statement"
 +    "switch_statement"
 +    "for_statement"
 +    "for_in_statement"
 +    "while_statement"
 +    "do_statement"
 +    "try_statement"
 +    "with_statement"
 +    "break_statement"
 +    "continue_statement"
 +    "return_statement"
 +    "throw_statement"
 +    "empty_statement"
 +    "labeled_statement"
 +    "variable_declaration"
 +    "lexical_declaration"
 +    "property_signature")
 +  "Nodes that designate sentences in TypeScript.
 +See `treesit-thing-settings' for more information.")
 +
 +(defvar typescript-ts-mode--sexp-nodes
 +  '("expression"
 +    "pattern"
 +    "array"
 +    "function"
 +    "string"
 +    "escape"
 +    "template"
 +    "regex"
 +    "number"
 +    "identifier"
 +    "this"
 +    "super"
 +    "true"
 +    "false"
 +    "null"
 +    "undefined"
 +    "arguments"
 +    "pair")
 +  "Nodes that designate sexps in TypeScript.
 +See `treesit-thing-settings' for more information.")
 +
  ;;;###autoload
  (define-derived-mode typescript-ts-base-mode prog-mode "TypeScript"
-   "Major mode for editing TypeScript."
+   "Generic major mode for editing TypeScript.
+ 
+ This mode is intended to be inherited by concrete major modes."
    :group 'typescript
    :syntax-table typescript-ts-mode--syntax-table