From ea18b4a60f3b89d261c46b030d3d026ddad864bb Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 20 Jun 2016 10:37:19 -0400 Subject: vim-patch:77cdfd1 Updated runtime files. https://github.com/vim/vim/commit/77cdfd10382e01cc51f4ba1a9177032351843151 Ignore changes to: * doc/channel.txt, doc/eval.txt: Channel related docs * doc/options.txt: GUI related docs * doc/tags: Generated at build time * doc/todo.txt: Irrelevant for Neovim --- runtime/doc/change.txt | 6 ++++-- runtime/doc/eval.txt | 2 +- runtime/doc/options.txt | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'runtime/doc') diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 4565cdf63e..2ccb9188a9 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.4. Last change: 2016 Feb 10 +*change.txt* For Vim version 7.4. Last change: 2016 Mar 08 VIM REFERENCE MANUAL by Bram Moolenaar @@ -108,7 +108,9 @@ is an error when 'cpoptions' includes the 'E' flag. *J* J Join [count] lines, with a minimum of two lines. Remove the indent and insert up to two spaces (see - below). + below). Fails when on the last line of the buffer. + If [count] is too big it is reduce to the number of + lines available. *v_J* {Visual}J Join the highlighted lines, with a minimum of two diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 4122b27fd8..712a0d7e5a 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2016 Mar 07 +*eval.txt* For Vim version 7.4. Last change: 2016 Mar 08 VIM REFERENCE MANUAL by Bram Moolenaar diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 887cff0707..76ecb57e34 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2016 Feb 24 +*options.txt* For Vim version 7.4. Last change: 2016 Mar 08 VIM REFERENCE MANUAL by Bram Moolenaar -- cgit