diff options
| author | Yegappan Lakshmanan <yegappan@yahoo.com> | 2024-02-11 17:08:29 +0100 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-02-11 17:08:29 +0100 |
| commit | be156a31c5400eb12025e480c477b1df88244801 (patch) | |
| tree | 27e16b25112d7087ecb1f82d34c2ac612d04d3e4 /runtime | |
| parent | 52eb0b867704e43049cb396e64cadb5bd9a3ad0b (diff) | |
patch 9.1.0096: diff() function uses 'diffexpr'v9.1.0096
Problem: diff() function uses 'diffexpr'
(rickhowe)
Solution: Make diff() always use internal diff(), add support for
unified diff context length, sort diff() options in help
(Yegappan Lakshmanan)
fixes: #13989
closes: #14010
Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/builtin.txt | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/runtime/doc/builtin.txt b/runtime/doc/builtin.txt index 062da08d6c..0dca4679e9 100644 --- a/runtime/doc/builtin.txt +++ b/runtime/doc/builtin.txt @@ -1,4 +1,4 @@ -*builtin.txt* For Vim version 9.1. Last change: 2024 Feb 01 +*builtin.txt* For Vim version 9.1. Last change: 2024 Feb 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2074,20 +2074,22 @@ diff({fromlist}, {tolist} [, {options}]) *diff()* The {options} Dict argument also specifies diff options (similar to 'diffopt') and supports the following items: + algorithm Dict specifying the diff algorithm to + use. Supported boolean items are + "myers", "minimal", "patience" and + "histogram". + context unified diff context length. Default + is 1. iblank ignore changes where lines are all blank. icase ignore changes in case of text. + indent-heuristic use the indent heuristic for the + internal diff library. iwhite ignore changes in amount of white space. iwhiteall ignore all white space changes. iwhiteeol ignore white space changes at end of line. - indent-heuristic use the indent heuristic for the - internal diff library. - algorithm Dict specifying the diff algorithm to - use. Supported boolean items are - "myers", "minimal", "patience" and - "histogram". For more information about these options, refer to 'diffopt'. Returns an empty List or String if {fromlist} and {tolist} are |