diff options
| -rw-r--r-- | runtime/doc/develop.txt | 19 | ||||
| -rw-r--r-- | runtime/doc/eval.txt | 11 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/various.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 2 |
5 files changed, 18 insertions, 20 deletions
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt index 2f96c4c6dc..d0dd741888 100644 --- a/runtime/doc/develop.txt +++ b/runtime/doc/develop.txt @@ -140,18 +140,13 @@ such that most users will enjoy using Vim as it is. Commands and options can be used to adjust Vim to the desire of the user and its environment. -VIM IS... NOT *design-not* - -- Vim is not a shell or an Operating System. You will not be able to run a - shell inside Vim or use it to control a debugger. This should work the - other way around: Use Vim as a component from a shell or in an IDE. - A satirical way to say this: "Unlike Emacs, Vim does not attempt to include - everything but the kitchen sink, but some people say that you can clean one - with it. ;-)" - To use Vim with gdb see: http://www.agide.org and http://clewn.sf.net. -- Vim is not a fancy GUI editor that tries to look nice at the cost of - being less consistent over all platforms. But functional GUI features are - welcomed. +NVIM IS... NOT *design-not* + +Nvim is not an Operating System; instead it should be composed with other +tools, or hosted as a component. Marvim once said: "Unlike Emacs, Nvim does +not attempt to include everything but the kitchen sink, but some people use it +for plumbing." + ============================================================================== 2. Coding style *coding-style* diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 33ee5b78c1..44a08909db 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1870,10 +1870,13 @@ invert( {expr}) Number bitwise invert isdirectory( {directory}) Number TRUE if {directory} is a directory islocked( {expr}) Number TRUE if {expr} is locked items( {dict}) List key-value pairs in {dict} -job_close({job}) Closes a job with id {job} -job_send({job}, {data}) Writes {data} to {job}'s stdin -job_spawn({name}, {prog}[, {argv}]) - Spawns {prog} as a job associated with {name} +jobclose({job}[, {stream}]) Number Closes a job stream(s) +jobresize({job}, {width}, {height}) + Number Resize {job}'s pseudo terminal window +jobsend({job}, {data}) Number Writes {data} to {job}'s stdin +jobstart({cmd}[, {opts}]) Number Spawns {cmd} as a job +jobstop({job}) Number Stops a job +jobwait({ids}[, {timeout}]) Number Wait for a set of jobs join( {list} [, {sep}]) String join {list} items into one String keys( {dict}) List keys in {dict} len( {expr}) Number the length of {expr} diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index baafe8cbea..35cd3985c3 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5342,8 +5342,8 @@ A jump table for the options with a short description can be found at |Q_op|. *'shada'* *'sd'* *E526* *E527* *E528* 'shada' 'sd' string (Vim default for - Win32: '!,100,<50,s10,h,rA:,rB: - others: '!,100,<50,s10,h + Win32: !,'100,<50,s10,h,rA:,rB: + others: !,'100,<50,s10,h Vi default: "") global When non-empty, the shada file is read upon startup and written diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 1b95cfe7d0..117e977e0d 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -212,7 +212,7 @@ g8 Print the hex values of the bytes used in the equivalent to: > :enew - :call termopen([&sh, &shcf, '{cmd}']) + :call termopen('{cmd}') :startinsert < If no {cmd} is given, 'shellcmdflag' will not be sent diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 6124c36dc9..1060b01a1e 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -197,7 +197,7 @@ Other options: 'macatsui' 'shelltype' 'shortname' - 'termencoding' + 'termencoding' (Vim 7.4.852 also removed this for Windows) 'textauto' 'textmode' 'toolbar' |