From f017ae611595a266decdd418c1e58c49a9a8d1b2 Mon Sep 17 00:00:00 2001 From: timeyyy Date: Fri, 17 Feb 2017 10:24:09 +0100 Subject: doc/provider: python virtualenvs #6135 Closes #1887 Helped-by: Tommy Allen --- runtime/doc/provider.txt | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'runtime/doc') diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt index 3cd53e3e50..ac4d7361f4 100644 --- a/runtime/doc/provider.txt +++ b/runtime/doc/provider.txt @@ -49,7 +49,8 @@ Note: The `--upgrade` flag ensures you have the latest version even if PYTHON PROVIDER CONFIGURATION ~ *g:python_host_prog* *g:python3_host_prog* -Program to use for evaluating Python code. Setting this makes startup faster. > +Program to use for evaluating Python code. Setting this makes startup faster. +Also useful for working with virtualenvs. > let g:python_host_prog = '/path/to/python' let g:python3_host_prog = '/path/to/python3' < @@ -61,6 +62,23 @@ To disable Python 2 support: > To disable Python 3 support: > let g:loaded_python3_provider = 1 +PYTHON VIRTUALENVS ~ + +If you plan to use per-project virtualenvs often, you should assign +a virtualenv for Neovim and hard-code the interpreter path via +|g:python_host_prog| (or |g:python3_host_prog|) so that the "neovim" python +package is not required for each Environment. Example using pyenv: > + pyenv install 3.4.4 + pyenv virtualenv 3.4.4 py3neovim + pyenv activate py3neovim + pip install neovim + pyenv which python # Note the path + +The last command reports the interpreter path. Add it to your init.vim: > + let g:python3_host_prog = '/full/path/to/py3neovim/bin/python' + +More information: +https://github.com/zchee/deoplete-jedi/wiki/Setting-up-Python-for-Neovim ============================================================================== Ruby integration *provider-ruby* @@ -80,7 +98,6 @@ RUBY PROVIDER CONFIGURATION ~ To disable Ruby support: > let g:loaded_ruby_provider = 1 - ============================================================================== Clipboard integration *provider-clipboard* *clipboard* @@ -93,7 +110,7 @@ are found in your `$PATH`. - xclip - xsel (newer alternative to xclip) - - pbcopy/pbpaste (Mac OS X) + - pbcopy/pbpaste (macOS) - lemonade (for SSH) https://github.com/pocke/lemonade - doitclient (for SSH) http://www.chiark.greenend.org.uk/~sgtatham/doit/ -- cgit From 158ea528545463a80ddce2cc83e52eb3b291cfa5 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 18 Feb 2017 14:01:20 +0100 Subject: options: Remove 'esckeys' (#6138) This was never supported and it does not make sense for Nvim. --- runtime/doc/insert.txt | 3 --- runtime/doc/options.txt | 12 ------------ runtime/doc/quickref.txt | 1 - runtime/doc/term.txt | 4 +--- runtime/doc/vim_diff.txt | 1 + 5 files changed, 2 insertions(+), 19 deletions(-) (limited to 'runtime/doc') diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index a82e17c857..2d3eaafe63 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -370,9 +370,6 @@ CTRL-G U don't break undo with next left/right cursor *i_CTRL-G_U* within same the line) ----------------------------------------------------------------------- -Note: If the cursor keys take you out of Insert mode, check the 'noesckeys' -option. - The CTRL-O command sometimes has a side effect: If the cursor was beyond the end of the line, it will be put on the last character in the line. In mappings it's often better to use (first put an "x" in the text, diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 97d56af369..4ae4725617 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2209,18 +2209,6 @@ A jump table for the options with a short description can be found at |Q_op|. Scanf-like description of the format for the lines in the error file (see |errorformat|). - *'esckeys'* *'ek'* *'noesckeys'* *'noek'* -'esckeys' 'ek' boolean (Vim default: on, Vi default: off) - global - Function keys that start with an are recognized in Insert - mode. When this option is off, the cursor and function keys cannot be - used in Insert mode if they start with an . The advantage of - this is that the single is recognized immediately, instead of - after one second. Instead of resetting this option, you might want to - try changing the values for 'timeoutlen' and 'ttimeoutlen'. Note that - when 'esckeys' is off, you can still map anything, but the cursor keys - won't work by default. - *'eventignore'* *'ei'* 'eventignore' 'ei' string (default "") global diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index a7644fab84..2e2bec7637 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -678,7 +678,6 @@ Short explanation of each option: *option-list* 'errorbells' 'eb' ring the bell for error messages 'errorfile' 'ef' name of the errorfile for the QuickFix mode 'errorformat' 'efm' description of the lines in the error file -'esckeys' 'ek' recognize function keys in Insert mode 'eventignore' 'ei' autocommand events that are ignored 'expandtab' 'et' use spaces when is inserted 'exrc' 'ex' read .nvimrc and .exrc in the current directory diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt index 08ffee7a2f..137d3a06db 100644 --- a/runtime/doc/term.txt +++ b/runtime/doc/term.txt @@ -70,9 +70,7 @@ for a next character to arrive. If it does not arrive within one second a single is assumed. On very slow systems this may fail, causing cursor keys not to work sometimes. If you discover this problem reset the 'timeout' option. Vim will wait for the next character to arrive after an . If -you want to enter a single you must type it twice. Resetting the -'esckeys' option avoids this problem in Insert mode, but you lose the -possibility to use cursor and function keys in Insert mode. +you want to enter a single you must type it twice. Some terminals have confusing codes for the cursor keys. The televideo 925 is such a terminal. It sends a CTRL-H for cursor-left. This would make it diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index eeb5e85036..176a29d072 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -298,6 +298,7 @@ Other options: 'antialias' 'cpoptions' ("g", "w", "H", "*", "-", "j", and all POSIX flags were removed) 'encoding' ("utf-8" is always used) + 'esckeys' 'guioptions' "t" flag was removed *'guipty'* (Nvim uses pipes and PTYs consistently on all platforms.) *'imactivatefunc'* *'imaf'* -- cgit From 308ccb6f5e40ba1dbe4abfebc9df3399d7f17504 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 18 Feb 2017 02:39:07 +0100 Subject: cmdline: CTRL-R: instead of CR between lines. ^M isn't any more "correct" than space: the "technically correct" interpretation is to execute the first line that is seen (and this is what happens on middle-click paste in Vim). ^M is only intended to defuse the newline, so that the user can review the command. We can do that with a space instead, and then the command can be executed without having to fix it up first. --- runtime/doc/vim_diff.txt | 3 +++ 1 file changed, 3 insertions(+) (limited to 'runtime/doc') diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index eeb5e85036..7fbd957a22 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -238,6 +238,9 @@ newly allocated memory all over the place) and fail on types which cannot be coerced to strings. See |id()| for more details, currently it uses `printf("%p", {expr})` internally. +|c_CTRL-R| pasting a non-special register into the |cmdline| separates lines +by instead of . + ============================================================================== 5. Missing legacy features *nvim-features-missing* *if_lua* *if_perl* *if_mzscheme* *if_tcl* -- cgit From baab49ee89a927f63bfefdb432155a1037afa93a Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 18 Feb 2017 23:15:27 +0100 Subject: cmdline: CTRL-R: Omit trailing . The "technically correct" interpretation is to execute the first line that is seen (and this is what happens on middle-click paste in Vim). ^M is only intended to "defuse" the newline, so the user can review it. The parent commit changed the behavior to insert between lines, but that's a higher-risk change: it is arguably possible that some user *wants* the literal ^M chars when e.g. assigning to a register: :let @a='b' To avoid that risk, keep the old behavior and only omit the last ^M. This makes `yy:0` nicer at no cost. --- runtime/doc/vim_diff.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'runtime/doc') diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 7fbd957a22..cfe6308663 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -238,8 +238,7 @@ newly allocated memory all over the place) and fail on types which cannot be coerced to strings. See |id()| for more details, currently it uses `printf("%p", {expr})` internally. -|c_CTRL-R| pasting a non-special register into the |cmdline| separates lines -by instead of . +|c_CTRL-R| pasting a non-special register into |cmdline| omits the last . ============================================================================== 5. Missing legacy features *nvim-features-missing* -- cgit