Mercurial > vim
diff src/option.c @ 10722:7598ce51bf2a v8.0.0251
patch 8.0.0251: not easy to select Python 2 or 3
commit https://github.com/vim/vim/commit/f42dd3c3901ea0ba38e67a616aea9953cae81b8d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 28 16:06:38 2017 +0100
patch 8.0.0251: not easy to select Python 2 or 3
Problem: It is not so easy to write a script that works with both Python 2
and Python 3, even when the Python code works with both.
Solution: Add 'pyxversion', :pyx, etc. (Marc Weber, Ken Takata)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 28 Jan 2017 16:15:04 +0100 |
| parents | 4940a195bd1f |
| children | 4dea7c96fc82 |
line wrap: on
line diff
--- a/src/option.c +++ b/src/option.c @@ -479,6 +479,17 @@ struct vimoption # define HIGHLIGHT_INIT "8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,N:CursorLineNr,r:Question,s:StatusLine,S:StatusLineNC,t:Title,v:Visual,w:WarningMsg,W:WildMenu,>:SignColumn,*:TabLine,#:TabLineSel,_:TabLineFill" #endif +/* Default python version for pyx* commands */ +#if defined(FEAT_PYTHON) && defined(FEAT_PYTHON3) +# define DEFAULT_PYTHON_VER 0 +#elif defined(FEAT_PYTHON3) +# define DEFAULT_PYTHON_VER 3 +#elif defined(FEAT_PYTHON) +# define DEFAULT_PYTHON_VER 2 +#else +# define DEFAULT_PYTHON_VER 0 +#endif + /* * options[] is initialized here. * The order of the options MUST be alphabetic for ":set all" and findoption(). @@ -2143,6 +2154,14 @@ static struct vimoption options[] = {(char_u *)DYNAMIC_PYTHON_DLL, (char_u *)0L} SCRIPTID_INIT}, #endif + {"pyxversion", "pyx", P_NUM|P_VI_DEF|P_SECURE, +#if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) + (char_u *)&p_pyx, PV_NONE, +#else + (char_u *)NULL, PV_NONE, +#endif + {(char_u *)DEFAULT_PYTHON_VER, (char_u *)0L} + SCRIPTID_INIT}, {"quoteescape", "qe", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_TEXTOBJ (char_u *)&p_qe, PV_QE, @@ -8826,6 +8845,15 @@ set_num_option( mzvim_reset_timer(); #endif +#if defined(FEAT_PYTHON) || defined(FEAT_PYTHON3) + /* 'pyxversion' */ + else if (pp == &p_pyx) + { + if (p_pyx != 0 && p_pyx != 2 && p_pyx != 3) + errmsg = e_invarg; + } +#endif + /* sync undo before 'undolevels' changes */ else if (pp == &p_ul) {