Mercurial > vim

comparison src/optiondefs.h @ 34369:92452a65138e v9.1.0114

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.1.0114: Setting some options may change curswant Commit: https://github.com/vim/vim/commit/fcaed6a70faf73bff3e5405ada556d726024f866 Author: zeertzjq <zeertzjq@outlook.com> Date: Sun Feb 18 09:33:54 2024 +0100 patch 9.1.0114: Setting some options may change curswant Problem: Setting some options changes curswant unnecessarily. Solution: Add a P_HLONLY flag that prevents changing curswant. (zeertzjq) closes: #14044 Signed-off-by: zeertzjq <zeertzjq@outlook.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Sun, 18 Feb 2024 09:45:06 +0100
parents 36843e079f64
children c5a945f7f3da
comparison
equal deleted inserted replaced
34368:a3236a7ac392 34369:92452a65138e
400 (char_u *)&p_aw, PV_NONE, NULL, NULL, 400 (char_u *)&p_aw, PV_NONE, NULL, NULL,
401 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 401 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
402 {"autowriteall","awa", P_BOOL|P_VI_DEF, 402 {"autowriteall","awa", P_BOOL|P_VI_DEF,
403 (char_u *)&p_awa, PV_NONE, NULL, NULL, 403 (char_u *)&p_awa, PV_NONE, NULL, NULL,
404 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 404 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
405 {"background", "bg", P_STRING|P_VI_DEF|P_RCLR, 405 {"background", "bg", P_STRING|P_VI_DEF|P_RCLR|P_HLONLY,
406 (char_u *)&p_bg, PV_NONE, did_set_background, expand_set_background, 406 (char_u *)&p_bg, PV_NONE, did_set_background, expand_set_background,
407 { 407 {
408 #if (defined(MSWIN)) && !defined(FEAT_GUI) 408 #if (defined(MSWIN)) && !defined(FEAT_GUI)
409 (char_u *)"dark", 409 (char_u *)"dark",
410 #else 410 #else
607 (char_u *)&p_ch, PV_NONE, did_set_cmdheight, NULL, 607 (char_u *)&p_ch, PV_NONE, did_set_cmdheight, NULL,
608 {(char_u *)1L, (char_u *)0L} SCTX_INIT}, 608 {(char_u *)1L, (char_u *)0L} SCTX_INIT},
609 {"cmdwinheight", "cwh", P_NUM|P_VI_DEF, 609 {"cmdwinheight", "cwh", P_NUM|P_VI_DEF,
610 (char_u *)&p_cwh, PV_NONE, NULL, NULL, 610 (char_u *)&p_cwh, PV_NONE, NULL, NULL,
611 {(char_u *)7L, (char_u *)0L} SCTX_INIT}, 611 {(char_u *)7L, (char_u *)0L} SCTX_INIT},
612 {"colorcolumn", "cc", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN, 612 {"colorcolumn", "cc", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN|P_HLONLY,
613 #ifdef FEAT_SYN_HL 613 #ifdef FEAT_SYN_HL
614 (char_u *)VAR_WIN, PV_CC, did_set_colorcolumn, NULL, 614 (char_u *)VAR_WIN, PV_CC, did_set_colorcolumn, NULL,
615 #else 615 #else
616 (char_u *)NULL, PV_NONE, NULL, NULL, 616 (char_u *)NULL, PV_NONE, NULL, NULL,
617 #endif 617 #endif
772 #endif 772 #endif
773 {(char_u *)0L, (char_u *)0L} SCTX_INIT}, 773 {(char_u *)0L, (char_u *)0L} SCTX_INIT},
774 {"cursorbind", "crb", P_BOOL|P_VI_DEF, 774 {"cursorbind", "crb", P_BOOL|P_VI_DEF,
775 (char_u *)VAR_WIN, PV_CRBIND, NULL, NULL, 775 (char_u *)VAR_WIN, PV_CRBIND, NULL, NULL,
776 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 776 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
777 {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWINONLY, 777 {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN|P_HLONLY,
778 #ifdef FEAT_SYN_HL 778 #ifdef FEAT_SYN_HL
779 (char_u *)VAR_WIN, PV_CUC, NULL, NULL, 779 (char_u *)VAR_WIN, PV_CUC, NULL, NULL,
780 #else 780 #else
781 (char_u *)NULL, PV_NONE, NULL, NULL, 781 (char_u *)NULL, PV_NONE, NULL, NULL,
782 #endif 782 #endif
783 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 783 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
784 {"cursorline", "cul", P_BOOL|P_VI_DEF|P_RWINONLY, 784 {"cursorline", "cul", P_BOOL|P_VI_DEF|P_RWIN|P_HLONLY,
785 #ifdef FEAT_SYN_HL 785 #ifdef FEAT_SYN_HL
786 (char_u *)VAR_WIN, PV_CUL, NULL, NULL, 786 (char_u *)VAR_WIN, PV_CUL, NULL, NULL,
787 #else 787 #else
788 (char_u *)NULL, PV_NONE, NULL, NULL, 788 (char_u *)NULL, PV_NONE, NULL, NULL,
789 #endif 789 #endif
790 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 790 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
791 {"cursorlineopt", "culopt", P_STRING|P_VI_DEF|P_RWIN|P_ONECOMMA|P_NODUP, 791 {"cursorlineopt", "culopt", P_STRING|P_VI_DEF|P_RWIN|P_HLONLY|P_ONECOMMA|P_NODUP,
792 #ifdef FEAT_SYN_HL 792 #ifdef FEAT_SYN_HL
793 (char_u *)VAR_WIN, PV_CULOPT, 793 (char_u *)VAR_WIN, PV_CULOPT,
794 did_set_cursorlineopt, expand_set_cursorlineopt, 794 did_set_cursorlineopt, expand_set_cursorlineopt,
795 #else 795 #else
796 (char_u *)NULL, PV_NONE, NULL, NULL, 796 (char_u *)NULL, PV_NONE, NULL, NULL,
1302 (char_u *)&p_hkmapp, PV_NONE, NULL, NULL, 1302 (char_u *)&p_hkmapp, PV_NONE, NULL, NULL,
1303 #else 1303 #else
1304 (char_u *)NULL, PV_NONE, NULL, NULL, 1304 (char_u *)NULL, PV_NONE, NULL, NULL,
1305 #endif 1305 #endif
1306 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 1306 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
1307 {"hlsearch", "hls", P_BOOL|P_VI_DEF|P_VIM|P_RALL, 1307 {"hlsearch", "hls", P_BOOL|P_VI_DEF|P_VIM|P_RALL|P_HLONLY,
1308 #if defined(FEAT_SEARCH_EXTRA) 1308 #if defined(FEAT_SEARCH_EXTRA)
1309 (char_u *)&p_hls, PV_NONE, did_set_hlsearch, NULL, 1309 (char_u *)&p_hls, PV_NONE, did_set_hlsearch, NULL,
1310 #else 1310 #else
1311 (char_u *)NULL, PV_NONE, NULL, NULL, 1311 (char_u *)NULL, PV_NONE, NULL, NULL,
1312 #endif 1312 #endif
2348 (char_u *)&p_sts, PV_STS, NULL, NULL, 2348 (char_u *)&p_sts, PV_STS, NULL, NULL,
2349 {(char_u *)0L, (char_u *)0L} SCTX_INIT}, 2349 {(char_u *)0L, (char_u *)0L} SCTX_INIT},
2350 {"sourceany", NULL, P_BOOL|P_VI_DEF, 2350 {"sourceany", NULL, P_BOOL|P_VI_DEF,
2351 (char_u *)NULL, PV_NONE, NULL, NULL, 2351 (char_u *)NULL, PV_NONE, NULL, NULL,
2352 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 2352 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
2353 {"spell", NULL, P_BOOL|P_VI_DEF|P_RWIN, 2353 {"spell", NULL, P_BOOL|P_VI_DEF|P_RWIN|P_HLONLY,
2354 #ifdef FEAT_SPELL 2354 #ifdef FEAT_SPELL
2355 (char_u *)VAR_WIN, PV_SPELL, did_set_spell, NULL, 2355 (char_u *)VAR_WIN, PV_SPELL, did_set_spell, NULL,
2356 #else 2356 #else
2357 (char_u *)NULL, PV_NONE, NULL, NULL, 2357 (char_u *)NULL, PV_NONE, NULL, NULL,
2358 #endif 2358 #endif
2359 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, 2359 {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
2360 {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF, 2360 {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_HLONLY,
2361 #ifdef FEAT_SPELL 2361 #ifdef FEAT_SPELL
2362 (char_u *)&p_spc, PV_SPC, did_set_spellcapcheck, NULL, 2362 (char_u *)&p_spc, PV_SPC, did_set_spellcapcheck, NULL,
2363 {(char_u *)"[.?!]\\_[\\])'\" ]\\+", (char_u *)0L} 2363 {(char_u *)"[.?!]\\_[\\])'\" ]\\+", (char_u *)0L}
2364 #else 2364 #else
2365 (char_u *)NULL, PV_NONE, NULL, NULL, 2365 (char_u *)NULL, PV_NONE, NULL, NULL,
2375 (char_u *)NULL, PV_NONE, NULL, NULL, 2375 (char_u *)NULL, PV_NONE, NULL, NULL,
2376 {(char_u *)0L, (char_u *)0L} 2376 {(char_u *)0L, (char_u *)0L}
2377 #endif 2377 #endif
2378 SCTX_INIT}, 2378 SCTX_INIT},
2379 {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA 2379 {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA
2380 |P_RBUF|P_EXPAND, 2380 |P_RBUF|P_HLONLY|P_EXPAND,
2381 #ifdef FEAT_SPELL 2381 #ifdef FEAT_SPELL
2382 (char_u *)&p_spl, PV_SPL, did_set_spelllang, NULL, 2382 (char_u *)&p_spl, PV_SPL, did_set_spelllang, NULL,
2383 {(char_u *)"en", (char_u *)0L} 2383 {(char_u *)"en", (char_u *)0L}
2384 #else 2384 #else
2385 (char_u *)NULL, PV_NONE, NULL, NULL, 2385 (char_u *)NULL, PV_NONE, NULL, NULL,
2386 {(char_u *)0L, (char_u *)0L} 2386 {(char_u *)0L, (char_u *)0L}
2387 #endif 2387 #endif
2388 SCTX_INIT}, 2388 SCTX_INIT},
2389 {"spelloptions", "spo", P_STRING|P_ALLOCED|P_VI_DEF 2389 {"spelloptions", "spo", P_STRING|P_ALLOCED|P_VI_DEF
2390 |P_ONECOMMA|P_NODUP|P_RBUF, 2390 |P_ONECOMMA|P_NODUP|P_RBUF|P_HLONLY,
2391 #ifdef FEAT_SPELL 2391 #ifdef FEAT_SPELL
2392 (char_u *)&p_spo, PV_SPO, did_set_spelloptions, expand_set_spelloptions, 2392 (char_u *)&p_spo, PV_SPO, did_set_spelloptions, expand_set_spelloptions,
2393 {(char_u *)"", (char_u *)0L} 2393 {(char_u *)"", (char_u *)0L}
2394 #else 2394 #else
2395 (char_u *)NULL, PV_NONE, NULL, NULL, 2395 (char_u *)NULL, PV_NONE, NULL, NULL,
2594 (char_u *)TRUE, 2594 (char_u *)TRUE,
2595 #else 2595 #else
2596 (char_u *)FALSE, 2596 (char_u *)FALSE,
2597 #endif 2597 #endif
2598 (char_u *)0L} SCTX_INIT}, 2598 (char_u *)0L} SCTX_INIT},
2599 {"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF, 2599 {"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF|P_HLONLY,
2600 (char_u *)&p_tw, PV_TW, did_set_textwidth, NULL, 2600 (char_u *)&p_tw, PV_TW, did_set_textwidth, NULL,
2601 {(char_u *)0L, (char_u *)0L} SCTX_INIT}, 2601 {(char_u *)0L, (char_u *)0L} SCTX_INIT},
2602 {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP|P_NDNAME, 2602 {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP|P_NDNAME,
2603 (char_u *)&p_tsr, PV_TSR, NULL, NULL, 2603 (char_u *)&p_tsr, PV_TSR, NULL, NULL,
2604 {(char_u *)"", (char_u *)0L} SCTX_INIT}, 2604 {(char_u *)"", (char_u *)0L} SCTX_INIT},