Mercurial > vim
view src/libvterm/README @ 30691:024e1c1da31f v9.0.0680
patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'
Commit: https://github.com/vim/vim/commit/3725116f6ec3b5c01e456b151a60c0690e04f76c
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Oct 6 20:48:00 2022 +0100
patch 9.0.0680: tests failing with 'breakindent', 'number' and "n" in 'cpo'
Problem: Tests failing with 'breakindent', 'number' and "n" in 'cpo'.
Solution: Do count the number column in topline if 'breakindent' is set.
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 06 Oct 2022 22:00:05 +0200 |
parents | 808edde1e97d |
children | 2d2758ffd959 |
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 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.