blob: 56c6e222be2e39d8e9d562218fdee8958701f34f [file] [log] [blame]
Bram Moolenaare4f25e42017-07-07 11:54:15 +02001This is a MODIFIED version of libvterm.
2
3The original can be found:
Bram Moolenaar9cc5f752017-07-23 22:07:27 +02004- on the original site (tar archive and Bazaar repository):
Bram Moolenaare4f25e42017-07-07 11:54:15 +02005 http://www.leonerd.org.uk/code/libvterm/
Bram Moolenaar9cc5f752017-07-23 22:07:27 +02006- cloned on Github:
Bram Moolenaare4f25e42017-07-07 11:54:15 +02007 https://github.com/neovim/libvterm
8
9Modifications:
Christian Brabandtec8deb02023-09-24 23:42:19 +020010- revisions up to 839 have been included
Bram Moolenaar6a12d262022-10-16 19:26:52 +010011- Added a .gitignore file.
12- use TRUE and FALSE instead of true and false
13- use int or unsigned int instead of bool
14- Converted some code from C99 to C90.
Bram Moolenaare4f25e42017-07-07 11:54:15 +020015- Other changes to support embedding in Vim.
Bram Moolenaarb5b49a32018-03-25 16:20:37 +020016
Bram Moolenaar02c037a2020-08-30 19:26:45 +020017To get the latest version of libvterm you need the "bzr" command and do:
18 bzr co http://bazaar.leonerd.org.uk/c/libvterm/
19
20To find the diff of a libvterm revision edit this URL, changing "999" to the
21patch number:
Bram Moolenaare178ba32020-05-17 14:59:47 +020022 https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3
Bram Moolenaarb5b49a32018-03-25 16:20:37 +020023
24To merge in changes from Github, do this:
25- Commit any pending changes.
26- Setup the merge tool:
27 git config merge.tool vimdiff
28 git config merge.conflictstyle diff3
29 git config mergetool.prompt false
30- Run the merge tool:
31 git mergetool
32 This will open a four-way diff between:
33 LOCAL - your current version
34 BASE - version as it was at your last sync
35 REMOTE - version at head on Github
36 MERGED - best-effort merge of LOCAL and REMOTE
37 Now find places where automatic merge didn't work, they are marked with
38 <<<<<<<<, ======= and >>>>>>>
39 Fix those places in MERGED, remove the markers, and save the file :wqall.