Mercurial > vim
comparison src/optiondefs.h @ 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 | d395fadbaf67 |
comparison
equal
deleted
inserted
replaced
28352:10886e23615f | 28353:8bc8071928ed |
---|---|
42 #define PV_CI OPT_BUF(BV_CI) | 42 #define PV_CI OPT_BUF(BV_CI) |
43 #ifdef FEAT_CINDENT | 43 #ifdef FEAT_CINDENT |
44 # define PV_CIN OPT_BUF(BV_CIN) | 44 # define PV_CIN OPT_BUF(BV_CIN) |
45 # define PV_CINK OPT_BUF(BV_CINK) | 45 # define PV_CINK OPT_BUF(BV_CINK) |
46 # define PV_CINO OPT_BUF(BV_CINO) | 46 # define PV_CINO OPT_BUF(BV_CINO) |
47 # define PV_CINSD OPT_BUF(BV_CINSD) | |
47 #endif | 48 #endif |
48 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | 49 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) |
49 # define PV_CINW OPT_BUF(BV_CINW) | 50 # define PV_CINW OPT_BUF(BV_CINW) |
50 #endif | 51 #endif |
51 #define PV_CM OPT_BOTH(OPT_BUF(BV_CM)) | 52 #define PV_CM OPT_BOTH(OPT_BUF(BV_CM)) |
601 (char_u *)&p_cino, PV_CINO, | 602 (char_u *)&p_cino, PV_CINO, |
602 #else | 603 #else |
603 (char_u *)NULL, PV_NONE, | 604 (char_u *)NULL, PV_NONE, |
604 #endif | 605 #endif |
605 {(char_u *)"", (char_u *)0L} SCTX_INIT}, | 606 {(char_u *)"", (char_u *)0L} SCTX_INIT}, |
607 {"cinscopedecls", "cinsd", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, | |
608 #ifdef FEAT_CINDENT | |
609 (char_u *)&p_cinsd, PV_CINSD, | |
610 {(char_u *)"public,protected,private", (char_u *)0L} | |
611 #else | |
612 (char_u *)NULL, PV_NONE, | |
613 {(char_u *)0L, (char_u *)0L} | |
614 #endif | |
615 SCTX_INIT}, | |
606 {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, | 616 {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, |
607 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) | 617 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) |
608 (char_u *)&p_cinw, PV_CINW, | 618 (char_u *)&p_cinw, PV_CINW, |
609 {(char_u *)"if,else,while,do,for,switch", | 619 {(char_u *)"if,else,while,do,for,switch", |
610 (char_u *)0L} | 620 (char_u *)0L} |