mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
Rename some "python3" symbols to "py3", as the command name.
Documentation updates.
This commit is contained in:
@@ -1474,10 +1474,11 @@ v:lc_time The current locale setting for time messages of the runtime
|
|||||||
command. See |multi-lang|.
|
command. See |multi-lang|.
|
||||||
|
|
||||||
*v:lnum* *lnum-variable*
|
*v:lnum* *lnum-variable*
|
||||||
v:lnum Line number for the 'foldexpr' |fold-expr| and 'indentexpr'
|
v:lnum Line number for the 'foldexpr' |fold-expr|, 'formatexpr' and
|
||||||
expressions, tab page number for 'guitablabel' and
|
'indentexpr' expressions, tab page number for 'guitablabel'
|
||||||
'guitabtooltip'. Only valid while one of these expressions is
|
and 'guitabtooltip'. Only valid while one of these
|
||||||
being evaluated. Read-only when in the |sandbox|.
|
expressions is being evaluated. Read-only when in the
|
||||||
|
|sandbox|.
|
||||||
|
|
||||||
*v:mouse_win* *mouse_win-variable*
|
*v:mouse_win* *mouse_win-variable*
|
||||||
v:mouse_win Window number for a mouse click obtained with |getchar()|.
|
v:mouse_win Window number for a mouse click obtained with |getchar()|.
|
||||||
@@ -8246,11 +8247,11 @@ missing: >
|
|||||||
==============================================================================
|
==============================================================================
|
||||||
11. The sandbox *eval-sandbox* *sandbox* *E48*
|
11. The sandbox *eval-sandbox* *sandbox* *E48*
|
||||||
|
|
||||||
The 'foldexpr', 'includeexpr', 'indentexpr', 'statusline' and 'foldtext'
|
The 'foldexpr', 'formatexpr', 'includeexpr', 'indentexpr', 'statusline' and
|
||||||
options are evaluated in a sandbox. This means that you are protected from
|
'foldtext' options may be evaluated in a sandbox. This means that you are
|
||||||
these expressions having nasty side effects. This gives some safety for when
|
protected from these expressions having nasty side effects. This gives some
|
||||||
these options are set from a modeline. It is also used when the command from
|
safety for when these options are set from a modeline. It is also used when
|
||||||
a tags file is executed and for CTRL-R = in the command line.
|
the command from a tags file is executed and for CTRL-R = in the command line.
|
||||||
The sandbox is also used for the |:sandbox| command.
|
The sandbox is also used for the |:sandbox| command.
|
||||||
|
|
||||||
These items are not allowed in the sandbox:
|
These items are not allowed in the sandbox:
|
||||||
|
@@ -16,8 +16,10 @@ The Python Interface to Vim *python* *Python*
|
|||||||
|
|
||||||
{Vi does not have any of these commands}
|
{Vi does not have any of these commands}
|
||||||
|
|
||||||
The Python interface is available only when Vim was compiled with the
|
The Python 2.x interface is available only when Vim was compiled with the
|
||||||
|+python| feature.
|
|+python| feature.
|
||||||
|
The Python 3 interface is available only when Vim was compiled with the
|
||||||
|
|+python3| feature.
|
||||||
|
|
||||||
==============================================================================
|
==============================================================================
|
||||||
1. Commands *python-commands*
|
1. Commands *python-commands*
|
||||||
@@ -333,7 +335,7 @@ sure edit "gvim.exe" and search for "python\d*.dll\c".
|
|||||||
|
|
||||||
Python 3 support can exist next to Python 2.x.
|
Python 3 support can exist next to Python 2.x.
|
||||||
|
|
||||||
*:py3* *:python3* *:py3file*
|
*:py3* *:py3file*
|
||||||
|
|
||||||
TODO
|
TODO
|
||||||
|
|
||||||
|
@@ -1382,6 +1382,8 @@ The commands are sorted on the non-optional part of their name.
|
|||||||
|:ptselect| :pts[elect] |:tselect| and show tag in preview window
|
|:ptselect| :pts[elect] |:tselect| and show tag in preview window
|
||||||
|:put| :pu[t] insert contents of register in the text
|
|:put| :pu[t] insert contents of register in the text
|
||||||
|:pwd| :pw[d] print current directory
|
|:pwd| :pw[d] print current directory
|
||||||
|
|:py3| :py3 execute Python 3 command
|
||||||
|
|:p3yfile| :py3f[ile] execute Python 3 script file
|
||||||
|:python| :py[thon] execute Python command
|
|:python| :py[thon] execute Python command
|
||||||
|:pyfile| :pyf[ile] execute Python script file
|
|:pyfile| :pyf[ile] execute Python script file
|
||||||
|:quit| :q[uit] quit current window (when one window quit Vim)
|
|:quit| :q[uit] quit current window (when one window quit Vim)
|
||||||
|
@@ -3125,12 +3125,15 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||||||
{not available when compiled without the |+eval|
|
{not available when compiled without the |+eval|
|
||||||
feature}
|
feature}
|
||||||
Expression which is evaluated to format a range of lines for the |gq|
|
Expression which is evaluated to format a range of lines for the |gq|
|
||||||
operator. When this option is empty 'formatprg' is used.
|
operator or automatic formatting (see 'formatoptions'). When this
|
||||||
|
option is empty 'formatprg' is used.
|
||||||
|
|
||||||
The |v:lnum| variable holds the first line to be formatted.
|
The |v:lnum| variable holds the first line to be formatted.
|
||||||
The |v:count| variable holds the number of lines to be formatted.
|
The |v:count| variable holds the number of lines to be formatted.
|
||||||
The |v:char| variable holds the character that is going to be
|
The |v:char| variable holds the character that is going to be
|
||||||
inserted. This can be empty. Don't insert it yet!
|
inserted if the expression is being evaluated due to
|
||||||
|
automatic formatting. This can be empty. Don't insert
|
||||||
|
it yet!
|
||||||
|
|
||||||
Example: >
|
Example: >
|
||||||
:set formatexpr=mylang#Format()
|
:set formatexpr=mylang#Format()
|
||||||
|
@@ -741,7 +741,7 @@ EX(CMD_python, "python", ex_python,
|
|||||||
RANGE|EXTRA|NEEDARG|CMDWIN),
|
RANGE|EXTRA|NEEDARG|CMDWIN),
|
||||||
EX(CMD_pyfile, "pyfile", ex_pyfile,
|
EX(CMD_pyfile, "pyfile", ex_pyfile,
|
||||||
RANGE|FILE1|NEEDARG|CMDWIN),
|
RANGE|FILE1|NEEDARG|CMDWIN),
|
||||||
EX(CMD_python3, "py3", ex_python3,
|
EX(CMD_py3, "py3", ex_py3,
|
||||||
RANGE|EXTRA|NEEDARG|CMDWIN),
|
RANGE|EXTRA|NEEDARG|CMDWIN),
|
||||||
EX(CMD_py3file, "py3file", ex_py3file,
|
EX(CMD_py3file, "py3file", ex_py3file,
|
||||||
RANGE|FILE1|NEEDARG|CMDWIN),
|
RANGE|FILE1|NEEDARG|CMDWIN),
|
||||||
|
@@ -270,7 +270,7 @@ static void ex_popup __ARGS((exarg_T *eap));
|
|||||||
# define ex_pyfile ex_ni
|
# define ex_pyfile ex_ni
|
||||||
#endif
|
#endif
|
||||||
#ifndef FEAT_PYTHON3
|
#ifndef FEAT_PYTHON3
|
||||||
# define ex_python3 ex_script_ni
|
# define ex_py3 ex_script_ni
|
||||||
# define ex_py3file ex_ni
|
# define ex_py3file ex_ni
|
||||||
#endif
|
#endif
|
||||||
#ifndef FEAT_TCL
|
#ifndef FEAT_TCL
|
||||||
@@ -2562,7 +2562,7 @@ do_one_cmd(cmdlinep, sourcing,
|
|||||||
case CMD_perl:
|
case CMD_perl:
|
||||||
case CMD_psearch:
|
case CMD_psearch:
|
||||||
case CMD_python:
|
case CMD_python:
|
||||||
case CMD_python3:
|
case CMD_py3:
|
||||||
case CMD_return:
|
case CMD_return:
|
||||||
case CMD_rightbelow:
|
case CMD_rightbelow:
|
||||||
case CMD_ruby:
|
case CMD_ruby:
|
||||||
@@ -2825,7 +2825,7 @@ find_command(eap, full)
|
|||||||
{
|
{
|
||||||
while (ASCII_ISALPHA(*p))
|
while (ASCII_ISALPHA(*p))
|
||||||
++p;
|
++p;
|
||||||
/* for python 3.x support (:py3, :python3) */
|
/* for python 3.x support ":py3" (and ":py4" :-) */
|
||||||
if (eap->cmd[0] == 'p' && eap->cmd[1] == 'y')
|
if (eap->cmd[0] == 'p' && eap->cmd[1] == 'y')
|
||||||
p = skipdigits(p);
|
p = skipdigits(p);
|
||||||
|
|
||||||
|
@@ -630,9 +630,9 @@ theend:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ":python3"
|
* ":py3"
|
||||||
*/
|
*/
|
||||||
void ex_python3(exarg_T *eap)
|
void ex_py3(exarg_T *eap)
|
||||||
{
|
{
|
||||||
char_u *script;
|
char_u *script;
|
||||||
|
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
/* if_python3.c */
|
/* if_python3.c */
|
||||||
int python3_enabled __ARGS((int verbose));
|
int python3_enabled __ARGS((int verbose));
|
||||||
void python3_end __ARGS((void));
|
void python3_end __ARGS((void));
|
||||||
void ex_python3 __ARGS((exarg_T *eap));
|
void ex_py3 __ARGS((exarg_T *eap));
|
||||||
void ex_py3file __ARGS((exarg_T *eap));
|
void ex_py3file __ARGS((exarg_T *eap));
|
||||||
void python3_buffer_free __ARGS((buf_T *buf));
|
void python3_buffer_free __ARGS((buf_T *buf));
|
||||||
void python3_window_free __ARGS((win_T *win));
|
void python3_window_free __ARGS((win_T *win));
|
||||||
|
Reference in New Issue
Block a user