Mercurial > vim
view src/libvterm/README @ 14903:c1ee9f32bec3 v8.1.0463
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
commit https://github.com/vim/vim/commit/798184cc67036285a24b38c0bf6668d4d1525548
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Oct 7 20:48:39 2018 +0200
patch 8.1.0463: "simalt ~x" in .vimrc blocks swap file prompt
Problem: "simalt ~x" in .vimrc blocks swap file prompt.
Solution: Flush buffers before prompting. (Yasuhiro Matsumoto,
closes #3518, closes #2192)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sun, 07 Oct 2018 21:00:05 +0200 |
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.