diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2023-02-25 06:30:14 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2023-02-25 06:30:14 +0100 |
| commit | 50b55656b9c5ce0d7940bec245f2d9725378d0a0 (patch) | |
| tree | 851e86ebecbdf9a1ae767f9242415aa29ff3ae1e /lisp/net/trampver.el | |
| parent | a129f257720dbef9adcaff58862d45ac142f93f6 (diff) | |
| parent | 5cf50d60041c82deccc4b32a8ecdb1a28b6e8f91 (diff) | |
| download | emacs-50b55656b9c5ce0d7940bec245f2d9725378d0a0.tar.gz | |
Merge from origin/emacs-29
5cf50d60041 Check the anchor along with the offset in treesit-indent-...
497018dd5c3 ; Fix typos in docstrings in c-ts-common.el
03072bbdd38 ; Set indent-tabs-mode to nil in c-ts-mode indent preproc...
4a25fa4586c Align to prev sibling for c-ts-mode indentation
d25f24fe57b Fix c-ts-common-statement-offset and c-ts-common--node-is
c92360c7a3b typescript-ts-mode: Highlight non-shorthand destructuring...
a795c51f605 Add more/finer faces for tree-sitter
146bce49321 Avoid crashes in batch mode due to lack of frame face cache
244a73cd729 Add Tramp version integrated in Emacs 28.3
# Conflicts:
# etc/NEWS
Diffstat (limited to 'lisp/net/trampver.el')
| -rw-r--r-- | lisp/net/trampver.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 9b271a7cfbd..ad7bf94cdcd 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -102,7 +102,7 @@ ("2.3.3" . "26.1") ("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2") ("2.3.5.26.3" . "26.3") ("2.4.3.27.1" . "27.1") ("2.4.5.27.2" . "27.2") - ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2") + ("2.5.2.28.1" . "28.1") ("2.5.3.28.2" . "28.2") ("2.5.4" . "28.3") ("2.6.0.29.1" . "29.1"))) (add-hook 'tramp-unload-hook |