Mercurial > vim
view src/libvterm/README @ 31867:7d505d77f6da v9.0.1266
patch 9.0.1266: error for space before ": type" is inconsistent
Commit: https://github.com/vim/vim/commit/ce93d162da8de2419c15b63286e2f72a8fe3bf2d
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jan 30 21:12:34 2023 +0000
patch 9.0.1266: error for space before ": type" is inconsistent
Problem: Error for space before ": type" is inconsistent.
Solution: Give E1059 in more places. (closes https://github.com/vim/vim/issues/11868)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Mon, 30 Jan 2023 22:15:03 +0100 |
parents | 82336c3b679d |
children | 5d1e6c4bf723 |
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 817 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.