Mercurial > vim
comparison runtime/doc/options.txt @ 23895:e313b6ee2d9c v8.2.2490
patch 8.2.2490: 'wrap' option is always reset when starting diff mode
Commit: https://github.com/vim/vim/commit/4223d43c0fb6ead1e611e4469a1680a9228b6015
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 10 13:18:17 2021 +0100
patch 8.2.2490: 'wrap' option is always reset when starting diff mode
Problem: 'wrap' option is always reset when starting diff mode.
Solution: Add the "followwrap" item in 'diffopt'. (Rick Howe, closes https://github.com/vim/vim/issues/7797)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 10 Feb 2021 13:30:03 +0100 |
| parents | 0bd44e94dd14 |
| children | 5b37a0bf7e3a |
comparison
equal
deleted
inserted
replaced
| 23894:543007252974 | 23895:e313b6ee2d9c |
|---|---|
| 2675 becomes hidden. | 2675 becomes hidden. |
| 2676 | 2676 |
| 2677 foldcolumn:{n} Set the 'foldcolumn' option to {n} when | 2677 foldcolumn:{n} Set the 'foldcolumn' option to {n} when |
| 2678 starting diff mode. Without this 2 is used. | 2678 starting diff mode. Without this 2 is used. |
| 2679 | 2679 |
| 2680 followwrap Follow the 'wrap' option and leave as it is. | |
| 2681 | |
| 2680 internal Use the internal diff library. This is | 2682 internal Use the internal diff library. This is |
| 2681 ignored when 'diffexpr' is set. *E960* | 2683 ignored when 'diffexpr' is set. *E960* |
| 2682 When running out of memory when writing a | 2684 When running out of memory when writing a |
| 2683 buffer this item will be ignored for diffs | 2685 buffer this item will be ignored for diffs |
| 2684 involving that buffer. Set the 'verbose' | 2686 involving that buffer. Set the 'verbose' |