diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2024-08-10 09:35:20 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-08-10 09:35:20 +0200 |
| commit | b026a293b1e9d7a30f7717e256fe5f7f1dfa20d7 (patch) | |
| tree | 1f22a9951945df86779b143f0eabe28978bdabb4 | |
| parent | 9c4b2462bb498f44044616f7309d111d12170369 (diff) | |
patch 9.1.0667: Some other options reset curswant unnecessarily when setv9.1.0667
Problem: Some other options reset curswant unnecessarily when set.
(Andrew Haust)
Solution: Don't reset curswant when setting 'comments', 'commentstring'
or 'define' (zeertzjq)
fixes: #15462
closes: #15467
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/optiondefs.h | 7 | ||||
| -rw-r--r-- | src/testdir/test_goto.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/optiondefs.h b/src/optiondefs.h index b5446193d5..8982ac6003 100644 --- a/src/optiondefs.h +++ b/src/optiondefs.h @@ -621,13 +621,12 @@ static struct vimoption options[] = {"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, (char_u *)&Columns, PV_NONE, NULL, NULL, {(char_u *)80L, (char_u *)0L} SCTX_INIT}, - {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA - |P_NODUP|P_CURSWANT, + {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, (char_u *)&p_com, PV_COM, did_set_comments, NULL, {(char_u *)"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-", (char_u *)0L} SCTX_INIT}, - {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT, + {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_FOLDING (char_u *)&p_cms, PV_CMS, did_set_commentstring, NULL, {(char_u *)"/* %s */", (char_u *)0L} @@ -801,7 +800,7 @@ static struct vimoption options[] = {"debug", NULL, P_STRING|P_VI_DEF, (char_u *)&p_debug, PV_NONE, did_set_debug, expand_set_debug, {(char_u *)"", (char_u *)0L} SCTX_INIT}, - {"define", "def", P_STRING|P_ALLOCED|P_VI_DEF|P_CURSWANT, + {"define", "def", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_FIND_ID (char_u *)&p_def, PV_DEF, NULL, NULL, {(char_u *)"^\\s*#\\s*define", (char_u *)0L} diff --git a/src/testdir/test_goto.vim b/src/testdir/test_goto.vim index 8813bcbacd..b6a6695d17 100644 --- a/src/testdir/test_goto.vim +++ b/src/testdir/test_goto.vim @@ -322,6 +322,7 @@ func Test_set_options_keep_col() normal j set invhlsearch spell spelllang=en,cjk spelloptions=camel textwidth=80 set cursorline cursorcolumn cursorlineopt=line colorcolumn=+1 winfixbuf + set comments=:# commentstring=#%s define=function set background=dark set background=light normal k @@ -329,6 +330,7 @@ func Test_set_options_keep_col() bwipe! set hlsearch& spell& spelllang& spelloptions& textwidth& set cursorline& cursorcolumn& cursorlineopt& colorcolumn& winfixbuf& + set comments& commentstring& define& set background& endfunc diff --git a/src/version.c b/src/version.c index 1aacff5e66..444a1b2685 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 667, +/**/ 666, /**/ 665, |