Mercurial > vim

comparison runtime/doc/builtin.txt @ 34332:7ccaadd7cf0b v9.1.0099

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0099: Not able to use diff() with 'diffexpr' Commit: https://github.com/vim/vim/commit/a0010a186d93187d2b69b857d75db8a1e01049bb Author: Yegappan Lakshmanan <yegappan@yahoo.com> Date: Mon Feb 12 20:21:26 2024 +0100 patch 9.1.0099: Not able to use diff() with 'diffexpr' Problem: Not able to use diff() with 'diffexpr' (rickhowe, after v9.1.0096) Solution: Use a default context length of 0, update diff() help text, add a test for using diff() with 'diffexpr' (Yegappan Lakshmanan) closes: #14013 Signed-off-by: Yegappan Lakshmanan <yegappan@yahoo.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Mon, 12 Feb 2024 20:30:06 +0100
parents 6d9f59e88fc2
children 4e0da2b33607
comparison
equal deleted inserted replaced
34331:deb659fd4c5a 34332:7ccaadd7cf0b
1 *builtin.txt* For Vim version 9.1. Last change: 2024 Feb 11 1 *builtin.txt* For Vim version 9.1. Last change: 2024 Feb 12
2 2
3 3
4 VIM REFERENCE MANUAL by Bram Moolenaar 4 VIM REFERENCE MANUAL by Bram Moolenaar
5 5
6 6
2076 (similar to 'diffopt') and supports the following items: 2076 (similar to 'diffopt') and supports the following items:
2077 algorithm Dict specifying the diff algorithm to 2077 algorithm Dict specifying the diff algorithm to
2078 use. Supported boolean items are 2078 use. Supported boolean items are
2079 "myers", "minimal", "patience" and 2079 "myers", "minimal", "patience" and
2080 "histogram". 2080 "histogram".
2081 context unified diff context length. Default 2081 context diff context length. Default is 0.
2082 is 1.
2083 iblank ignore changes where lines are all 2082 iblank ignore changes where lines are all
2084 blank. 2083 blank.
2085 icase ignore changes in case of text. 2084 icase ignore changes in case of text.
2086 indent-heuristic use the indent heuristic for the 2085 indent-heuristic use the indent heuristic for the
2087 internal diff library. 2086 internal diff library.
2089 space. 2088 space.
2090 iwhiteall ignore all white space changes. 2089 iwhiteall ignore all white space changes.
2091 iwhiteeol ignore white space changes at end of 2090 iwhiteeol ignore white space changes at end of
2092 line. 2091 line.
2093 For more information about these options, refer to 'diffopt'. 2092 For more information about these options, refer to 'diffopt'.
2093
2094 To compute the unified diff, all the items in {fromlist} are
2095 concatenated into a string using a newline separator and the
2096 same for {tolist}. The unified diff output uses line numbers.
2094 2097
2095 Returns an empty List or String if {fromlist} and {tolist} are 2098 Returns an empty List or String if {fromlist} and {tolist} are
2096 identical. 2099 identical.
2097 2100
2098 Examples: > 2101 Examples: >