diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-02-12 03:27:46 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-02-12 03:27:46 +0100 |
| commit | 08bd066149faee95fe6660d5002306a1dbc4b91b (patch) | |
| tree | 6fc5a9ecbcee5b59aa377fa90f7f729a0a8c6e31 /admin | |
| parent | 14c97db7366435b1edbf2854f485058a9d7c6071 (diff) | |
| parent | 4da398d8b57aae740f054b4d04cba72735a4044c (diff) | |
| download | emacs-08bd066149faee95fe6660d5002306a1dbc4b91b.tar.gz | |
Merge from origin/emacs-29
4da398d8b57 ; Fix typos
074008ee2d2 ; Fix doc strings in lisp/image/ directory
2d1e43436da ; Improve documentation of hash functions.
900f7e07275 ; Remove extraneous local variables from image-dired-*.el...
4f053afe8e7 bug-reference: prevent match-data clobbering (bug#61395)
10af9fbcad1 ; * admin/notes/tree-sitter/starter-guide: Typos.
9ac242ce93d ; Fix recent changes in treesit docs
f5789aefc2e Rename LIMIT to DEPTH in tree-sitter functions (bug#61231)
b39821fdcef ; Fix incorrect function name in treesit manual
51901736965 Add 'live' property to treesit-node-check (bug#61235)
56960a6558b Update to Transient v0.3.7-205-gb8ad0da
68a6b364d1c Fix 'rmail-summary-output'
67c6ec25590 lisp-mode: add docstring recognition for more common lisp...
417a8ed8b05 ; Improve discoverability of empty file names handling
e47cf6ca15a Update to Transient v0.3.7-204-gecff8c2
b04cce02ff4 Fix Scala entry in Eglot's DB of LSP servers
# Conflicts:
# lisp/transient.el
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/notes/tree-sitter/html-manual/Multiple-Languages.html | 6 | ||||
| -rw-r--r-- | admin/notes/tree-sitter/starter-guide | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html index 65507687d51..390d9082590 100644 --- a/admin/notes/tree-sitter/html-manual/Multiple-Languages.html +++ b/admin/notes/tree-sitter/html-manual/Multiple-Languages.html @@ -223,9 +223,9 @@ ranges for <acronym>CSS</acronym> and JavaScript parsers: </p> <div class="example"> <pre class="example">;; Create parsers. -(setq html (treesit-get-parser-create 'html)) -(setq css (treesit-get-parser-create 'css)) -(setq js (treesit-get-parser-create 'javascript)) +(setq html (treesit-parser-create 'html)) +(setq css (treesit-parser-create 'css)) +(setq js (treesit-parser-create 'javascript)) </pre><pre class="example"> </pre><pre class="example">;; Set CSS ranges. diff --git a/admin/notes/tree-sitter/starter-guide b/admin/notes/tree-sitter/starter-guide index 606f7891dfa..b8910aab5ca 100644 --- a/admin/notes/tree-sitter/starter-guide +++ b/admin/notes/tree-sitter/starter-guide @@ -45,7 +45,7 @@ You can use this script that I put together here: You can also find them under this directory in /build-modules. This script automatically pulls and builds language definitions for C, -C++, Rust, JSON, Go, HTML, Javascript, CSS, Python, Typescript, +C++, Rust, JSON, Go, HTML, JavaScript, CSS, Python, Typescript, and C#. Better yet, I pre-built these language definitions for GNU/Linux and macOS, they can be downloaded here: @@ -271,7 +271,7 @@ Matchers and anchors are functions that takes (NODE PARENT BOL &rest _). Matches return nil/non-nil for no match/match, and anchors return the anchor point. Below are some convenient builtin matchers and anchors. -For MATHCER we have +For MATCHER we have (parent-is TYPE) => matches if PARENT’s type matches TYPE as regexp (node-is TYPE) => matches NODE’s type |