1- *options.txt* For Vim version 9.1. Last change: 2025 Jan 10
1+ *options.txt* For Vim version 9.1. Last change: 2025 Jan 12
22
33
44 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2880,11 +2880,20 @@ A jump table for the options with a short description can be found at |Q_op|.
28802880 Option settings for diff mode. It can consist of the following items.
28812881 All are optional. Items must be separated by a comma.
28822882
2883- filler Show filler lines, to keep the text
2884- synchronized with a window that has inserted
2885- lines at the same position. Mostly useful
2886- when windows are side-by-side and 'scrollbind'
2887- is set.
2883+ algorithm:{text} Use the specified diff algorithm with the
2884+ internal diff engine. Currently supported
2885+ algorithms are:
2886+ myers the default algorithm
2887+ minimal spend extra time to generate the
2888+ smallest possible diff
2889+ patience patience diff algorithm
2890+ histogram histogram diff algorithm
2891+
2892+ closeoff When a window is closed where 'diff' is set
2893+ and there is only one window remaining in the
2894+ same tab page with 'diff' set, execute
2895+ `:diffoff ` in that window. This undoes a
2896+ `:diffsplit ` command.
28882897
28892898 context:{n} Use a context of {n} lines between a change
28902899 and a fold that contains unchanged lines.
@@ -2895,6 +2904,23 @@ A jump table for the options with a short description can be found at |Q_op|.
28952904 value (999999) to disable folding completely.
28962905 See | fold-diff | .
28972906
2907+ filler Show filler lines, to keep the text
2908+ synchronized with a window that has inserted
2909+ lines at the same position. Mostly useful
2910+ when windows are side-by-side and 'scrollbind'
2911+ is set.
2912+
2913+ foldcolumn:{n} Set the 'foldcolumn' option to {n} when
2914+ starting diff mode. Without this 2 is used.
2915+
2916+ followwrap Follow the 'wrap' option and leave as it is.
2917+
2918+ horizontal Start diff mode with horizontal splits (unless
2919+ explicitly specified otherwise).
2920+
2921+ hiddenoff Do not use diff mode for a buffer when it
2922+ becomes hidden.
2923+
28982924 iblank Ignore changes where lines are all blank. Adds
28992925 the "-B" flag to the "diff" command if
29002926 'diffexpr' is empty. Check the documentation
@@ -2908,6 +2934,17 @@ A jump table for the options with a short description can be found at |Q_op|.
29082934 are considered the same. Adds the "-i" flag
29092935 to the "diff" command if 'diffexpr' is empty.
29102936
2937+ indent-heuristic
2938+ Use the indent heuristic for the internal
2939+ diff library.
2940+
2941+ internal Use the internal diff library. This is
2942+ ignored when 'diffexpr' is set. *E960*
2943+ When running out of memory when writing a
2944+ buffer this item will be ignored for diffs
2945+ involving that buffer. Set the 'verbose'
2946+ option to see when this happens.
2947+
29112948 iwhite Ignore changes in amount of white space. Adds
29122949 the "-b" flag to the "diff" command if
29132950 'diffexpr' is empty. Check the documentation
@@ -2927,46 +2964,19 @@ A jump table for the options with a short description can be found at |Q_op|.
29272964 of the "diff" command for what this does
29282965 exactly.
29292966
2930- horizontal Start diff mode with horizontal splits (unless
2931- explicitly specified otherwise).
2967+ linematch:{n} Align and mark changes between the most
2968+ similar lines between the buffers. When the
2969+ total number of lines in the diff hunk exceeds
2970+ {n} , the lines will not be aligned because for
2971+ very large diff hunks there will be a
2972+ noticeable lag. A reasonable setting is
2973+ "linematch:60", as this will enable alignment
2974+ for a 2 buffer diff hunk of 30 lines each,
2975+ or a 3 buffer diff hunk of 20 lines each.
29322976
29332977 vertical Start diff mode with vertical splits (unless
29342978 explicitly specified otherwise).
29352979
2936- closeoff When a window is closed where 'diff' is set
2937- and there is only one window remaining in the
2938- same tab page with 'diff' set, execute
2939- `:diffoff ` in that window. This undoes a
2940- `:diffsplit ` command.
2941-
2942- hiddenoff Do not use diff mode for a buffer when it
2943- becomes hidden.
2944-
2945- foldcolumn:{n} Set the 'foldcolumn' option to {n} when
2946- starting diff mode. Without this 2 is used.
2947-
2948- followwrap Follow the 'wrap' option and leave as it is.
2949-
2950- internal Use the internal diff library. This is
2951- ignored when 'diffexpr' is set. *E960*
2952- When running out of memory when writing a
2953- buffer this item will be ignored for diffs
2954- involving that buffer. Set the 'verbose'
2955- option to see when this happens.
2956-
2957- indent-heuristic
2958- Use the indent heuristic for the internal
2959- diff library.
2960-
2961- algorithm:{text} Use the specified diff algorithm with the
2962- internal diff engine. Currently supported
2963- algorithms are:
2964- myers the default algorithm
2965- minimal spend extra time to generate the
2966- smallest possible diff
2967- patience patience diff algorithm
2968- histogram histogram diff algorithm
2969-
29702980 Examples: >
29712981 :set diffopt=internal,filler,context:4
29722982 :set diffopt=
0 commit comments