Mercurial > vim
comparison src/structs.h @ 9955:f52b263fb3f0 v7.4.2251
commit https://github.com/vim/vim/commit/015efc32c1add6269099364835ddf85ff257b3c6
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 24 22:34:33 2016 +0200
patch 7.4.2251
Problem: In rare cases diffing 4 buffers is not enough.
Solution: Raise the limit to 8. (closes https://github.com/vim/vim/issues/1000)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 24 Aug 2016 22:45:06 +0200 |
| parents | e975914c17e9 |
| children | b222552cf0c4 |
comparison
equal
deleted
inserted
replaced
| 9954:500c11e614a5 | 9955:f52b263fb3f0 |
|---|---|
| 2294 | 2294 |
| 2295 #ifdef FEAT_DIFF | 2295 #ifdef FEAT_DIFF |
| 2296 /* | 2296 /* |
| 2297 * Stuff for diff mode. | 2297 * Stuff for diff mode. |
| 2298 */ | 2298 */ |
| 2299 # define DB_COUNT 4 /* up to four buffers can be diff'ed */ | 2299 # define DB_COUNT 8 /* up to eight buffers can be diff'ed */ |
| 2300 | 2300 |
| 2301 /* | 2301 /* |
| 2302 * Each diffblock defines where a block of lines starts in each of the buffers | 2302 * Each diffblock defines where a block of lines starts in each of the buffers |
| 2303 * and how many lines it occupies in that buffer. When the lines are missing | 2303 * and how many lines it occupies in that buffer. When the lines are missing |
| 2304 * in the buffer the df_count[] is zero. This is all counted in | 2304 * in the buffer the df_count[] is zero. This is all counted in |