Mercurial > vim
comparison src/option.c @ 11073:d2178a6cc9f3 v8.0.0425
patch 8.0.0425: build errors when building without folding
commit https://github.com/vim/vim/commit/a6c07603ca2fa98a4184f5fd5ab021adcf5156b2
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Mar 5 21:18:27 2017 +0100
patch 8.0.0425: build errors when building without folding
Problem: Build errors when building without folding.
Solution: Add #ifdefs. (John Marriott)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 05 Mar 2017 21:30:05 +0100 |
| parents | e71d3bdf3bc3 |
| children | cde7933ad315 |
comparison
equal
deleted
inserted
replaced
| 11072:35d25dacc361 | 11073:d2178a6cc9f3 |
|---|---|
| 4533 /* In diff mode some options are overruled. This avoids that | 4533 /* In diff mode some options are overruled. This avoids that |
| 4534 * 'foldmethod' becomes "marker" instead of "diff" and that | 4534 * 'foldmethod' becomes "marker" instead of "diff" and that |
| 4535 * "wrap" gets set. */ | 4535 * "wrap" gets set. */ |
| 4536 if (curwin->w_p_diff | 4536 if (curwin->w_p_diff |
| 4537 && opt_idx >= 0 /* shut up coverity warning */ | 4537 && opt_idx >= 0 /* shut up coverity warning */ |
| 4538 && (options[opt_idx].indir == PV_FDM | 4538 && ( |
| 4539 || options[opt_idx].indir == PV_WRAP)) | 4539 #ifdef FEAT_FOLDING |
| 4540 options[opt_idx].indir == PV_FDM || | |
| 4541 #endif | |
| 4542 options[opt_idx].indir == PV_WRAP)) | |
| 4540 goto skip; | 4543 goto skip; |
| 4541 #endif | 4544 #endif |
| 4542 } | 4545 } |
| 4543 | 4546 |
| 4544 #ifdef HAVE_SANDBOX | 4547 #ifdef HAVE_SANDBOX |