neovim

commit 19b49b063c28f7d246bf1b452e5ad59a44345c9d
parent b003e7feca98ca5e588fdfa1b6fb5c293a68b6d1
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Tue,  3 Oct 2023 06:21:59 +0800

vim-patch:20f48d5b2ddb

runtime(doc): mention how to disable folding in diff mode (vim/vim#13242)

https://github.com/vim/vim/commit/20f48d5b2ddb9fdc29e83f0da6f31f895eaeab47

Co-authored-by: dundargoc <33953936+dundargoc@users.noreply.github.com>

Diffstat:
M
runtime/doc/options.txt
 | 
3
++-
M
runtime/lua/vim/_meta/options.lua
 | 
3
++-
M
src/nvim/options.lua
 | 
3
++-

3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -1966,7 +1966,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 				When omitted a context of six lines is used.
 				When using zero the context is actually one,
 				since folds require a line in between, also
-				for a deleted line.
+				for a deleted line. Set it to a very large
+				value (999999) to disable folding completely.
 				See |fold-diff|.
 
 		iblank		Ignore changes where lines are all blank.  Adds
diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua
@@ -1591,7 +1591,8 @@ vim.go.dex = vim.go.diffexpr
 --- 			When omitted a context of six lines is used.
 --- 			When using zero the context is actually one,
 --- 			since folds require a line in between, also
---- 			for a deleted line.
+--- 			for a deleted line. Set it to a very large
+--- 			value (999999) to disable folding completely.
 --- 			See `fold-diff`.
 ---
 --- 	iblank		Ignore changes where lines are all blank.  Adds
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
@@ -2067,7 +2067,8 @@ return {
         			When omitted a context of six lines is used.
         			When using zero the context is actually one,
         			since folds require a line in between, also
-        			for a deleted line.
+        			for a deleted line. Set it to a very large
+        			value (999999) to disable folding completely.
         			See |fold-diff|.
 
         	iblank		Ignore changes where lines are all blank.  Adds