Mercurial > vim
changeset 5712:06e5f65c34d8 v7.4.201
updated for version 7.4.201
Problem: 'lispwords' is a global option.
Solution: Make 'lispwords' global-local. (Sung Pae)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 12 Mar 2014 18:55:58 +0100 |
| parents | 81ad042b81b7 |
| children | 7f6acd6dc5b3 |
| files | runtime/doc/options.txt runtime/optwin.vim src/buffer.c src/misc1.c src/option.c src/option.h src/structs.h src/testdir/test100.in src/testdir/test100.ok src/version.c |
| diffstat | 10 files changed, 51 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4629,7 +4629,7 @@ A jump table for the options with a shor *'lispwords'* *'lw'* 'lispwords' 'lw' string (default is very long) - global + global or local to buffer |global-local| {not in Vi} {not available when compiled without the |+lispindent| feature}
--- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -855,7 +855,7 @@ if has("lispindent") call append("$", "\t(local to buffer)") call <SID>BinOptionL("lisp") call append("$", "lispwords\twords that change how lisp indenting works") - call <SID>OptionG("lw", &lw) + call <SID>OptionL("lw", &lw) endif
--- a/src/buffer.c +++ b/src/buffer.c @@ -1978,6 +1978,9 @@ free_buf_options(buf, free_p_ff) #endif buf->b_p_ar = -1; buf->b_p_ul = NO_LOCAL_UNDOLEVEL; +#ifdef FEAT_LISP + clear_string_option(&buf->b_p_lw); +#endif } /*
--- a/src/misc1.c +++ b/src/misc1.c @@ -8879,7 +8879,7 @@ lisp_match(p) { char_u buf[LSIZE]; int len; - char_u *word = p_lispwords; + char_u *word = *curbuf->b_p_lw != NUL ? curbuf->b_p_lw : p_lispwords; while (*word != NUL) {
--- a/src/option.c +++ b/src/option.c @@ -134,6 +134,7 @@ #define PV_KP OPT_BOTH(OPT_BUF(BV_KP)) #ifdef FEAT_LISP # define PV_LISP OPT_BUF(BV_LISP) +# define PV_LW OPT_BOTH(OPT_BUF(BV_LW)) #endif #define PV_MA OPT_BUF(BV_MA) #define PV_ML OPT_BUF(BV_ML) @@ -1718,7 +1719,7 @@ static struct vimoption {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"lispwords", "lw", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, #ifdef FEAT_LISP - (char_u *)&p_lispwords, PV_NONE, + (char_u *)&p_lispwords, PV_LW, {(char_u *)LISPWORD_VALUE, (char_u *)0L} #else (char_u *)NULL, PV_NONE, @@ -5412,6 +5413,9 @@ check_buf_options(buf) check_string_option(&buf->b_p_dict); check_string_option(&buf->b_p_tsr); #endif +#ifdef FEAT_LISP + check_string_option(&buf->b_p_lw); +#endif } /* @@ -9879,6 +9883,11 @@ unset_global_local_option(name, from) case PV_UL: buf->b_p_ul = NO_LOCAL_UNDOLEVEL; break; +#ifdef FEAT_LISP + case PV_LW: + clear_string_option(&buf->b_p_lw); + break; +#endif } } @@ -9928,6 +9937,9 @@ get_varp_scope(p, opt_flags) case PV_STL: return (char_u *)&(curwin->w_p_stl); #endif case PV_UL: return (char_u *)&(curbuf->b_p_ul); +#ifdef FEAT_LISP + case PV_LW: return (char_u *)&(curbuf->b_p_lw); +#endif } return NULL; /* "cannot happen" */ } @@ -9994,6 +10006,10 @@ get_varp(p) #endif case PV_UL: return curbuf->b_p_ul != NO_LOCAL_UNDOLEVEL ? (char_u *)&(curbuf->b_p_ul) : p->var; +#ifdef FEAT_LISP + case PV_LW: return *curbuf->b_p_lw != NUL + ? (char_u *)&(curbuf->b_p_lw) : p->var; +#endif #ifdef FEAT_ARABIC case PV_ARAB: return (char_u *)&(curwin->w_p_arab); @@ -10567,6 +10583,9 @@ buf_copy_options(buf, flags) #ifdef FEAT_PERSISTENT_UNDO buf->b_p_udf = p_udf; #endif +#ifdef FEAT_LISP + buf->b_p_lw = empty_option; +#endif /* * Don't copy the options set by ex_help(), use the saved values,
--- a/src/option.h +++ b/src/option.h @@ -990,6 +990,7 @@ enum , BV_KP #ifdef FEAT_LISP , BV_LISP + , BV_LW #endif , BV_MA , BV_ML
--- a/src/structs.h +++ b/src/structs.h @@ -1641,6 +1641,9 @@ struct file_buffer #ifdef FEAT_PERSISTENT_UNDO int b_p_udf; /* 'undofile' */ #endif +#ifdef FEAT_LISP + char_u *b_p_lw; /* 'lispwords' local value */ +#endif /* end of buffer options */
--- a/src/testdir/test100.in +++ b/src/testdir/test100.in @@ -1,4 +1,4 @@ -Tests for 'undolevel' setting being global-local +Tests for 'undolevel' and 'lispwords' settings being global-local STARTTEST :so small.vim @@ -37,6 +37,14 @@ STARTTEST :call UndoLevel() :%w >> test.out :"sleep 10 +:" +:" Testing 'lispwords' +:" +:setglobal lispwords=foo,bar,baz +:setlocal lispwords-=foo | setlocal lispwords+=quux +:redir >> test.out | echon "\nTesting 'lispwords' local value" | setglobal lispwords? | setlocal lispwords? | echo &lispwords . "\n" | redir end +:setlocal lispwords< +:redir >> test.out | echon "\nTesting 'lispwords' value reset" | setglobal lispwords? | setlocal lispwords? | echo &lispwords . "\n" | redir end :qa! ENDTEST
--- a/src/testdir/test100.ok +++ b/src/testdir/test100.ok @@ -39,3 +39,13 @@ THREE: expecting global undolevels: 50, undolevels=50 global undolevels=-123456 local + +Testing 'lispwords' local value + lispwords=foo,bar,baz + lispwords=bar,baz,quux +bar,baz,quux + +Testing 'lispwords' value reset + lispwords=foo,bar,baz + lispwords=foo,bar,baz +foo,bar,baz