Permalink
Browse files

Rename some "python3" symbols to "py3", as the command name.

Documentation updates.

--HG--
branch : vim73
  • Loading branch information...
1 parent b30d60f commit 206e86e4b3d4ad60f628e1276c3b44324daa8896 @brammool brammool committed Jul 19, 2010
Showing with 28 additions and 20 deletions.
  1. +10 −9 runtime/doc/eval.txt
  2. +4 −2 runtime/doc/if_pyth.txt
  3. +2 −0 runtime/doc/index.txt
  4. +5 −2 runtime/doc/options.txt
  5. +1 −1 src/ex_cmds.h
  6. +3 −3 src/ex_docmd.c
  7. +2 −2 src/if_python3.c
  8. +1 −1 src/proto/if_python3.pro
View
@@ -1474,10 +1474,11 @@ v:lc_time The current locale setting for time messages of the runtime
command. See |multi-lang|.
*v:lnum* *lnum-variable*
-v:lnum Line number for the 'foldexpr' |fold-expr| and 'indentexpr'
- expressions, tab page number for 'guitablabel' and
- 'guitabtooltip'. Only valid while one of these expressions is
- being evaluated. Read-only when in the |sandbox|.
+v:lnum Line number for the 'foldexpr' |fold-expr|, 'formatexpr' and
+ 'indentexpr' expressions, tab page number for 'guitablabel'
+ and 'guitabtooltip'. Only valid while one of these
+ expressions is being evaluated. Read-only when in the
+ |sandbox|.
*v:mouse_win* *mouse_win-variable*
v:mouse_win Window number for a mouse click obtained with |getchar()|.
@@ -8246,11 +8247,11 @@ missing: >
==============================================================================
11. The sandbox *eval-sandbox* *sandbox* *E48*
-The 'foldexpr', 'includeexpr', 'indentexpr', 'statusline' and 'foldtext'
-options are evaluated in a sandbox. This means that you are protected from
-these expressions having nasty side effects. This gives some safety for when
-these options are set from a modeline. It is also used when the command from
-a tags file is executed and for CTRL-R = in the command line.
+The 'foldexpr', 'formatexpr', 'includeexpr', 'indentexpr', 'statusline' and
+'foldtext' options may be evaluated in a sandbox. This means that you are
+protected from these expressions having nasty side effects. This gives some
+safety for when these options are set from a modeline. It is also used when
+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.
These items are not allowed in the sandbox:
View
@@ -16,8 +16,10 @@ The Python Interface to Vim *python* *Python*
{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.
+The Python 3 interface is available only when Vim was compiled with the
+|+python3| feature.
==============================================================================
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.
-*:py3* *:python3* *:py3file*
+*:py3* *:py3file*
TODO
View
@@ -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
|:put| :pu[t] insert contents of register in the text
|: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
|:pyfile| :pyf[ile] execute Python script file
|:quit| :q[uit] quit current window (when one window quit Vim)
View
@@ -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|
feature}
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:count| variable holds the number of lines to be formatted.
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: >
:set formatexpr=mylang#Format()
View
@@ -741,7 +741,7 @@ EX(CMD_python, "python", ex_python,
RANGE|EXTRA|NEEDARG|CMDWIN),
EX(CMD_pyfile, "pyfile", ex_pyfile,
RANGE|FILE1|NEEDARG|CMDWIN),
-EX(CMD_python3, "py3", ex_python3,
+EX(CMD_py3, "py3", ex_py3,
RANGE|EXTRA|NEEDARG|CMDWIN),
EX(CMD_py3file, "py3file", ex_py3file,
RANGE|FILE1|NEEDARG|CMDWIN),
View
@@ -270,7 +270,7 @@ static void ex_popup __ARGS((exarg_T *eap));
# define ex_pyfile ex_ni
#endif
#ifndef FEAT_PYTHON3
-# define ex_python3 ex_script_ni
+# define ex_py3 ex_script_ni
# define ex_py3file ex_ni
#endif
#ifndef FEAT_TCL
@@ -2562,7 +2562,7 @@ do_one_cmd(cmdlinep, sourcing,
case CMD_perl:
case CMD_psearch:
case CMD_python:
- case CMD_python3:
+ case CMD_py3:
case CMD_return:
case CMD_rightbelow:
case CMD_ruby:
@@ -2825,7 +2825,7 @@ find_command(eap, full)
{
while (ASCII_ISALPHA(*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')
p = skipdigits(p);
View
@@ -630,9 +630,9 @@ static void DoPy3Command(exarg_T *eap, const char *cmd)
}
/*
- * ":python3"
+ * ":py3"
*/
-void ex_python3(exarg_T *eap)
+void ex_py3(exarg_T *eap)
{
char_u *script;
View
@@ -1,7 +1,7 @@
/* if_python3.c */
int python3_enabled __ARGS((int verbose));
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 python3_buffer_free __ARGS((buf_T *buf));
void python3_window_free __ARGS((win_T *win));

0 comments on commit 206e86e

Please sign in to comment.