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

Documentation updates.

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 0f04980b0e0431a23f524c13542b62521341b5e5..f2a9f657aa8a2dc3cb85d62d30eb9b70a4118fab 100644 (file)
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -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:

diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 42e6478c0291d0c9254305656f35b2ce10346bab..43535514345bd109766f91bfd5b0f68ea00a84ef 100644 (file)
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -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
 

diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 6a4839bad1ed4b38975b9bfb83ac5d313cbbce93..069154a670587661876a898e8f42cacefe6ceedb 100644 (file)
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -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)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index acfbf60240c56695dc9b164be7c35e26f2c52784..776717771a88eaa9920660da27499f5906f9402c 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -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()

diff --git a/src/ex_cmds.h b/src/ex_cmds.h
index 3e83ef7b30a7aff1f762e63cc7c48d2b0b2af9bb..e45796f69e73e59935a5c99fdf761d140f015a13 100644 (file)
--- a/src/ex_cmds.h
+++ b/src/ex_cmds.h
@@ -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),

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index c57db94968efe31486969745b22f4606724edf4f..b56fb670b15d175cd7af60a21e6cf4ae73194d22 100644 (file)
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -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);
 

diff --git a/src/if_python3.c b/src/if_python3.c
index 410dc1484f22d52aaded1e73c4dd844ec4a3c81e..422878ac03f8c4be29b6eae58f66efe6ae70c656 100644 (file)
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -630,9 +630,9 @@ theend:
 }
 
 /*
- * ":python3"
+ * ":py3"
  */
-void ex_python3(exarg_T *eap)
+void ex_py3(exarg_T *eap)
 {
     char_u *script;
 

diff --git a/src/proto/if_python3.pro b/src/proto/if_python3.pro
index a2c7e4c1604140b67419f42093bf60dbb4058e1d..f9921e1c9ae28ede5d8d690eb5961e90f265bdea 100644 (file)
--- a/src/proto/if_python3.pro
+++ b/src/proto/if_python3.pro
@@ -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));