Mercurial > vim
view src/libvterm/README @ 15353:21580db06cf3 v8.1.0684
patch 8.1.0684: warnings from 64-bit compiler
commit https://github.com/vim/vim/commit/4b7214ea7834c72188f4a7b0b76b49b81fef7d27
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jan 3 21:55:32 2019 +0100
patch 8.1.0684: warnings from 64-bit compiler
Problem: Warnings from 64-bit compiler.
Solution: Add type casts. (Mike Williams)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 03 Jan 2019 22:00:06 +0100 |
parents | 9f857e6310b6 |
children | e02d45e302a2 |
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: - Add a .gitignore file. - Convert from C99 to C90. - Other changes to support embedding in Vim. 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.