Mercurial > vim
view src/libvterm/README @ 34644:9b94748e226a
runtime(java): Update java[CR]_JavaLang type lists (#14297)
Commit: https://github.com/vim/vim/commit/63d68c2c218eeb80c164e1c56c53f51a9e92a5eb
Author: Aliaksei Budavei <32549825+zzzyxwvut@users.noreply.github.com>
Date: Tue Mar 26 20:12:05 2024 +0300
runtime(java): Update java[CR]_JavaLang type lists (https://github.com/vim/vim/issues/14297)
- Add to the list of java.lang runtime exceptions two new
types: MatchException (Pattern Matching for _switch_) and
WrongThreadException (Virtual Threads).
- "Demote" Compiler (removed in JDK 21) from the list of
java.lang class types to a new list javaLangDeprecated.
References:
https://bugs.openjdk.org/browse/JDK-8205129
https://bugs.openjdk.org/browse/JDK-8282274
https://bugs.openjdk.org/browse/JDK-8284161
Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 26 Mar 2024 18:15:08 +0100 |
parents | 5d1e6c4bf723 |
children |
line wrap: on
line source
This is a MODIFIED version of libvterm. The original can be found: - on the original site (tar archive and Bazaar repository): http://www.leonerd.org.uk/code/libvterm/ - cloned on Github: https://github.com/neovim/libvterm Modifications: - revisions up to 839 have been included - Added a .gitignore file. - use TRUE and FALSE instead of true and false - use int or unsigned int instead of bool - Converted some code from C99 to C90. - Other changes to support embedding in Vim. To get the latest version of libvterm you need the "bzr" command and do: bzr co http://bazaar.leonerd.org.uk/c/libvterm/ To find the diff of a libvterm revision edit this URL, changing "999" to the patch number: https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3 To merge in changes from Github, do this: - Commit any pending changes. - Setup the merge tool: git config merge.tool vimdiff git config merge.conflictstyle diff3 git config mergetool.prompt false - Run the merge tool: git mergetool This will open a four-way diff between: LOCAL - your current version BASE - version as it was at your last sync REMOTE - version at head on Github MERGED - best-effort merge of LOCAL and REMOTE Now find places where automatic merge didn't work, they are marked with <<<<<<<<, ======= and >>>>>>> Fix those places in MERGED, remove the markers, and save the file :wqall.