diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/if_pyth.txt | 48 | ||||
| -rw-r--r-- | runtime/doc/tags | 3 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 8 |
3 files changed, 42 insertions, 17 deletions
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt index edac29540..a4a6e9d3a 100644 --- a/runtime/doc/if_pyth.txt +++ b/runtime/doc/if_pyth.txt @@ -335,32 +335,48 @@ Currently the name is "python24.dll". That is for Python 2.4. To know for sure edit "gvim.exe" and search for "python\d*.dll\c". ============================================================================== -7. Python 3 *python3* +7. Python 3 *python3* - *:py3* *:python3* + *:py3* *:python3* The |:py3| and |:python3| commands work similar to |:python|. - *:py3file* + *:py3file* The |:py3file| command works similar to |:pyfile|. Vim can be built in four ways (:version output): -1. No Python support (-python, -python3) +1. No Python support (-python, -python3) 2. Python 2 support only (+python or +python/dyn, -python3) 3. Python 3 support only (-python, +python3 or +python3/dyn) 4. Python 2 and 3 support (+python/dyn, +python3/dyn) +Some more details on the special case 4: + +When Python 2 and Python 3 are both supported they must be loaded dynamically. + +When doing this on Linux/Unix systems and importing global symbols, this leads +to a crash when the second Python version is used. So either global symbols +are loaded but only one Python version is activated, or no global symbols are +loaded. The latter makes Python's "import" fail on libaries that expect the +symbols to be provided by Vim. *E836* *E837* -You can see that when Python 2 and Python 3 are both supported they must be -loaded dynamically. Depending on how the libraries have been build it might -be impossible to use ":py3" and ":python" in one Vim session. - -On Linux/Unix systems this can only be done without importing global symbols. -In this case python's "import" might fail, if the library expects the symbols -to be provided by vim. To work around this -1. either the problematic library, or python in case of standard libraries, - must be recompiled to link to the according libpython.so file - (--enable-shared in case of python). -2. Or you recompile vim for only one python version. In this case all symbols - can be imported into vim. +Vim's configuration script makes a guess for all libraries based on one +standard Python library (termios). If importing this library succeeds for +both Python versions, then both will be made available in Vim at the same +time. If not, only the version first used in a session will be enabled. +When trying to use the other one you will get the E836 or E837 error message. + +Here Vim's behavior depends on the system in which it was configured. In a +system where both versions of Python were configured with --enable-shared, +both versions of Python will be activated at the same time. There will still +be problems with other third party libraries that were not linked to +libPython. + +To work around such problems there are these options: +1. The problematic library is recompiled to link to the according + libpython.so. +2. Vim is recompiled for only one Python version. +3. You undefine PY_NO_RTLD_GLOBAL in auto/config.h after configuration. This + may crash Vim though. + ============================================================================== vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/tags b/runtime/doc/tags index 92e296fab..3ebcf41fd 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4217,6 +4217,8 @@ E832 undo.txt /*E832* E833 editing.txt /*E833* E834 options.txt /*E834* E835 options.txt /*E835* +E836 if_pyth.txt /*E836* +E837 if_pyth.txt /*E837* E84 windows.txt /*E84* E85 options.txt /*E85* E86 windows.txt /*E86* @@ -5810,6 +5812,7 @@ g:tar_nomax pi_tar.txt /*g:tar_nomax* g:tar_readoptions pi_tar.txt /*g:tar_readoptions* g:tar_secure pi_tar.txt /*g:tar_secure* g:tar_writeoptions pi_tar.txt /*g:tar_writeoptions* +g:tex_conceal syntax.txt /*g:tex_conceal* g:var eval.txt /*g:var* g:vimball_home pi_vimball.txt /*g:vimball_home* g:vimball_mkdir pi_vimball.txt /*g:vimball_mkdir* diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index c26f04182..f627ef670 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.3f. Last change: 2010 Aug 08 +*version7.txt* For Vim version 7.3f. Last change: 2010 Aug 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -10126,5 +10126,11 @@ contains a character that would become double width. Set 'wrapscan' when checking the .po files. (Mike Williams) +Fixed: using expression in command line may cause a crash. + +Avoid warnings from the clang compiler. (Dominique Pelle) + +Fix: Include wchar.h in charset.c for towupper(). + vim:tw=78:ts=8:ft=help:norl: |