Mercurial > vim
view runtime/doc/vimdiff.man @ 35257:008e5022f187
runtime(i3config/swayconfig): support floating_modifier none; revert broken highlighting
Commit: https://github.com/vim/vim/commit/22ac941208fcb2c63ad172c6cf0b39b077b5b682
Author: James Eapen <james.eapen@vai.org>
Date: Thu May 23 20:47:49 2024 +0200
runtime(i3config/swayconfig): support floating_modifier none; revert broken highlighting
- fix floating_modifier $mod normal|inverse was being hightlighted as error
reverting the floating_modifier change from dd83b63
- will currently allow invalid syntax after floating_modifier
fixes: #14826
closes: #14827
Co-authored-by: JosefLitos <litosjos@fit.cvut.cz>
Signed-off-by: James Eapen <james.eapen@vai.org>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 23 May 2024 21:00:03 +0200 |
parents | fd37be6dc258 |
children | 4a958ef2dc5e |
line wrap: on
line source
VIMDIFF(1) General Commands Manual VIMDIFF(1) NAME vimdiff - edit between two and eight versions of a file with Vim and show differences SYNOPSIS vimdiff [options] file1 file2 [file3 [file4 [file5 [file6 [file7 [file8]]]]]] gvimdiff DESCRIPTION Vimdiff starts Vim on two up to eight files. Each file gets its own window. The differences between the files are highlighted. This is a nice way to inspect changes and to move changes from one version to an‐ other version of the same file. See vim(1) for details about Vim itself. When started as gvimdiff the GUI will be started, if available. In each window the 'diff' option will be set, which causes the differ‐ ences to be highlighted. The 'wrap' and 'scrollbind' options are set to make the text look good. The 'foldmethod' option is set to "diff", which puts ranges of lines without changes in a fold. 'foldcolumn' is set to two to make it easy to spot the folds and open or close them. OPTIONS Vertical splits are used to align the lines, as if the "-O" argument was used. To use horizontal splits instead, use the "-o" argument. For all other arguments see vim(1). SEE ALSO vim(1) AUTHOR Most of Vim was made by Bram Moolenaar, with a lot of help from others. See ":help credits" in Vim. 2001 March 30 VIMDIFF(1)