comparison src/option.c @ 28353:8bc8071928ed v8.2.4702

patch 8.2.4702: C++ scope labels are hard-coded Commit: https://github.com/vim/vim/commit/3506cf34c17c5eae6c2d1317db1fcd5a8493c288 Author: Tom Praschan <13141438+tom-anders@users.noreply.github.com> Date: Thu Apr 7 12:39:08 2022 +0100 patch 8.2.4702: C++ scope labels are hard-coded Problem: C++ scope labels are hard-coded. Solution: Add 'cinscopedecls' to define the labels. (Rom Praschan, closes #10109)
author Bram Moolenaar <Bram@vim.org>
date Thu, 07 Apr 2022 13:45:04 +0200
parents 1cd053ebb5fc
children 86b6432aa1d8
comparison
equal deleted inserted replaced
28352:10886e23615f 28353:8bc8071928ed
5447 case PV_CI: return (char_u *)&(curbuf->b_p_ci); 5447 case PV_CI: return (char_u *)&(curbuf->b_p_ci);
5448 #ifdef FEAT_CINDENT 5448 #ifdef FEAT_CINDENT
5449 case PV_CIN: return (char_u *)&(curbuf->b_p_cin); 5449 case PV_CIN: return (char_u *)&(curbuf->b_p_cin);
5450 case PV_CINK: return (char_u *)&(curbuf->b_p_cink); 5450 case PV_CINK: return (char_u *)&(curbuf->b_p_cink);
5451 case PV_CINO: return (char_u *)&(curbuf->b_p_cino); 5451 case PV_CINO: return (char_u *)&(curbuf->b_p_cino);
5452 case PV_CINSD: return (char_u *)&(curbuf->b_p_cinsd);
5452 #endif 5453 #endif
5453 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) 5454 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
5454 case PV_CINW: return (char_u *)&(curbuf->b_p_cinw); 5455 case PV_CINW: return (char_u *)&(curbuf->b_p_cinw);
5455 #endif 5456 #endif
5456 case PV_COM: return (char_u *)&(curbuf->b_p_com); 5457 case PV_COM: return (char_u *)&(curbuf->b_p_com);
6018 COPY_OPT_SCTX(buf, BV_CIN); 6019 COPY_OPT_SCTX(buf, BV_CIN);
6019 buf->b_p_cink = vim_strsave(p_cink); 6020 buf->b_p_cink = vim_strsave(p_cink);
6020 COPY_OPT_SCTX(buf, BV_CINK); 6021 COPY_OPT_SCTX(buf, BV_CINK);
6021 buf->b_p_cino = vim_strsave(p_cino); 6022 buf->b_p_cino = vim_strsave(p_cino);
6022 COPY_OPT_SCTX(buf, BV_CINO); 6023 COPY_OPT_SCTX(buf, BV_CINO);
6024 buf->b_p_cinsd = vim_strsave(p_cinsd);
6025 COPY_OPT_SCTX(buf, BV_CINSD);
6023 #endif 6026 #endif
6024 // Don't copy 'filetype', it must be detected 6027 // Don't copy 'filetype', it must be detected
6025 buf->b_p_ft = empty_option; 6028 buf->b_p_ft = empty_option;
6026 buf->b_p_pi = p_pi; 6029 buf->b_p_pi = p_pi;
6027 COPY_OPT_SCTX(buf, BV_PI); 6030 COPY_OPT_SCTX(buf, BV_PI);