diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-15 16:03:30 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2016-12-28 14:57:38 -0500 |
| commit | 6205846cd969bf6bafc933cb295c4cef819b9e84 (patch) | |
| tree | 3de1ba4dfc17a741177f8c3521022c13a02e4445 /runtime/doc | |
| parent | 00466410701802214aba5c95f1cbb2e5086a37f5 (diff) | |
| download | rneovim-6205846cd969bf6bafc933cb295c4cef819b9e84.tar.gz rneovim-6205846cd969bf6bafc933cb295c4cef819b9e84.tar.bz2 rneovim-6205846cd969bf6bafc933cb295c4cef819b9e84.zip | |
vim-patch:0952131
Updated runtime files.
https://github.com/vim/vim/commit/0952131376a517fc12dc5ae908a97018b4ee23f0
Diffstat (limited to 'runtime/doc')
| -rw-r--r-- | runtime/doc/editing.txt | 12 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/quickref.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/sign.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 4 |
5 files changed, 21 insertions, 12 deletions
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt index 8b6c14cc52..06dd21de06 100644 --- a/runtime/doc/editing.txt +++ b/runtime/doc/editing.txt @@ -1,4 +1,4 @@ -*editing.txt* For Vim version 7.4. Last change: 2016 Mar 28 +*editing.txt* For Vim version 7.4. Last change: 2016 Aug 06 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1046,10 +1046,12 @@ The names can be in upper- or lowercase. edited. See |:confirm| and 'confirm'. :q[uit]! Quit without writing, also when the current buffer has - changes. If this is the last window and there is a - modified hidden buffer, the current buffer is - abandoned and the first changed hidden buffer becomes - the current buffer. + changes. The buffer is unloaded, also when it has + 'hidden' set. + If this is the last window and there is a modified + hidden buffer, the current buffer is abandoned and the + first changed hidden buffer becomes the current + buffer. Use ":qall!" to exit always. :cq[uit] Quit always, without writing, and return an error diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 20d46a9f0c..e15fb9dc84 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -5632,8 +5632,10 @@ A jump table for the options with a short description can be found at |Q_op|. *'signcolumn'* *'scl'* 'signcolumn' 'scl' string (default "auto") local to window - Whether or not to draw the signcolumn. "auto" means it will only be - drawn when there is a sign to display. + Whether or not to draw the signcolumn. Valid values are: + "auto" only when there is a sign to display + "no" never + "yes" always *'smartcase'* *'scs'* *'nosmartcase'* *'noscs'* diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index fcfecc02a1..2b5ed33f06 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.4. Last change: 2016 Mar 30 +*quickref.txt* For Vim version 7.4. Last change: 2016 Aug 12 VIM REFERENCE MANUAL by Bram Moolenaar @@ -861,6 +861,7 @@ Short explanation of each option: *option-list* 'showtabline' 'stal' tells when the tab pages line is displayed 'sidescroll' 'ss' minimum number of columns to scroll horizontal 'sidescrolloff' 'siso' min. nr. of columns to left and right of cursor +'signcolumn' 'scl' when to display the sign column 'smartcase' 'scs' no ignore case when pattern has uppercase 'smartindent' 'si' smart autoindenting for C programs 'smarttab' 'sta' use 'shiftwidth' when inserting <Tab> diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt index 44a5361c5d..fd1fe8dce3 100644 --- a/runtime/doc/sign.txt +++ b/runtime/doc/sign.txt @@ -1,4 +1,4 @@ -*sign.txt* For Vim version 7.4. Last change: 2014 May 07 +*sign.txt* For Vim version 7.4. Last change: 2016 Aug 12 VIM REFERENCE MANUAL by Gordon Prieur @@ -40,8 +40,10 @@ There are two steps in using signs: When signs are defined for a file, Vim will automatically add a column of two characters to display them in. When the last sign is unplaced the column -disappears again. The color of the column is set with the SignColumn group -|hl-SignColumn|. Example to set the color: > +disappears again. This behavior can be changed with the 'signcolumn' option. + +The color of the column is set with the SignColumn group |hl-SignColumn|. +Example to set the color: > :highlight SignColumn guibg=darkgrey diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 4030c7a681..4886828c82 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.4. Last change: 2016 Apr 10 +*syntax.txt* For Vim version 7.4. Last change: 2016 Aug 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -944,6 +944,8 @@ Variable Highlight ~ *c_no_bracket_error* don't highlight {}; inside [] as errors *c_no_curly_error* don't highlight {}; inside [] and () as errors; except { and } in first column + Default is to highlight them, otherwise you + can't spot a missing ")". *c_curly_error* highlight a missing }; this forces syncing from the start of the file, can be slow *c_no_ansi* don't do standard ANSI types and constants |