mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:98ef233e14fa

Browse Source 
Update runtime files. Convert a couple of help files to utf-8.
98ef233e14
This commit is contained in:
Justin M. Keyes
2018-10-29 06:39:10 +01:00
parent c7513368f0
commit 5c4a421735
6 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runtime/doc/autocmd.txt
View File

@@ -44,6 +44,8 @@ effects. Be careful not to destroy your text.
Add {cmd} to the list of commands that Vim will Add {cmd} to the list of commands that Vim will
execute automatically on {event} for a file matching execute automatically on {event} for a file matching
{pat} |autocmd-patterns|. {pat} |autocmd-patterns|.
Note: A quote character is seen as argument to the
:autocmd and won't start a comment.
Vim always adds the {cmd} after existing autocommands, Vim always adds the {cmd} after existing autocommands,
so that the autocommands execute in the order in which so that the autocommands execute in the order in which
they were given. See |autocmd-nested| for [nested]. they were given. See |autocmd-nested| for [nested].
@@ -79,7 +81,8 @@ will appear twice. To avoid this, define your autocommands in a group, so
that you can easily clear them: > that you can easily clear them: >
augroup vimrc augroup vimrc
autocmd! " Remove all vimrc autocommands " Remove all vimrc autocommands
autocmd!
au BufNewFile,BufRead *.html so <sfile>:h/html.vim au BufNewFile,BufRead *.html so <sfile>:h/html.vim
augroup END augroup END
@@ -133,6 +136,8 @@ prompt. When one command outputs two messages this can happen anyway.
plugins, syntax highlighting, etc. plugins, syntax highlighting, etc.
:au[tocmd]! [group] Remove ALL autocommands. :au[tocmd]! [group] Remove ALL autocommands.
Note: a quote will be seen as argument to the :autocmd
and won't start a comment.
Warning: You should normally not do this without a Warning: You should normally not do this without a
group, it breaks plugins, syntax highlighting, etc. group, it breaks plugins, syntax highlighting, etc.
@@ -313,15 +318,12 @@ Name triggered by ~
|TabNew| when creating a new tab page |TabNew| when creating a new tab page
|TabNewEntered| after entering a new tab page |TabNewEntered| after entering a new tab page
|TabClosed| after closing a tab page |TabClosed| after closing a tab page
|CmdlineChanged| after a change was made to the command-line text
|CmdlineEnter| after entering cmdline mode |CmdlineEnter| after entering cmdline mode
|CmdlineLeave| before leaving cmdline mode |CmdlineLeave| before leaving cmdline mode
|CmdwinEnter| after entering the command-line window |CmdwinEnter| after entering the command-line window
|CmdwinLeave| before leaving the command-line window |CmdwinLeave| before leaving the command-line window
|CmdlineChanged| after a change was made to the command-line text
|CmdlineEnter| after the cursor moves to the command line
|CmdlineLeave| before the cursor leaves the command line
|InsertEnter| starting Insert mode |InsertEnter| starting Insert mode
|InsertChange| when typing <Insert> while in Insert or Replace mode |InsertChange| when typing <Insert> while in Insert or Replace mode
|InsertLeave| when leaving Insert mode |InsertLeave| when leaving Insert mode

6
runtime/doc/eval.txt
View File

@@ -2101,6 +2101,7 @@ gettabvar({nr}, {varname} [, {def}])
gettabwinvar({tabnr}, {winnr}, {name} [, {def}]) gettabwinvar({tabnr}, {winnr}, {name} [, {def}])
any {name} in {winnr} in tab page {tabnr} any {name} in {winnr} in tab page {tabnr}
getwininfo([{winid}]) List list of windows getwininfo([{winid}]) List list of windows
getwinpos([{timeout}]) List X and Y coord in pixels of the Vim window
getwinposx() Number X coord in pixels of GUI Vim window getwinposx() Number X coord in pixels of GUI Vim window
getwinposy() Number Y coord in pixels of GUI Vim window getwinposy() Number Y coord in pixels of GUI Vim window
getwinvar({nr}, {varname} [, {def}]) getwinvar({nr}, {varname} [, {def}])
@@ -8572,6 +8573,8 @@ visual Compiled with Visual mode.
visualextra Compiled with extra Visual mode commands. visualextra Compiled with extra Visual mode commands.
|blockwise-operators|. |blockwise-operators|.
vreplace Compiled with |gR| and |gr| commands. vreplace Compiled with |gR| and |gr| commands.
vtp Compiled for vcon support |+vtp| (check vcon to find
out if it works in the current console)).
wildignore Compiled with 'wildignore' option. wildignore Compiled with 'wildignore' option.
wildmenu Compiled with 'wildmenu' option. wildmenu Compiled with 'wildmenu' option.
win32 Windows version of Vim (32 or 64 bit). win32 Windows version of Vim (32 or 64 bit).
@@ -8796,8 +8799,7 @@ may be larger.
It is also possible to define a function without any arguments. You must It is also possible to define a function without any arguments. You must
still supply the () then. still supply the () then.
It is allowed to define another function inside a function It is allowed to define another function inside a function body.
body.
*local-variables* *local-variables*
Inside a function local variables can be used. These will disappear when the Inside a function local variables can be used. These will disappear when the

3
runtime/doc/pattern.txt
View File

@@ -1148,7 +1148,8 @@ x A single character, with no special meaning, matches itself
- Matching with a collection can be slow, because each character in - Matching with a collection can be slow, because each character in
the text has to be compared with each character in the collection. the text has to be compared with each character in the collection.
Use one of the other atoms above when possible. Example: "\d" is Use one of the other atoms above when possible. Example: "\d" is
much faster than "[0-9]" and matches the same characters. much faster than "[0-9]" and matches the same characters. However,
the new |NFA| regexp engine deals with this better than the old one.
*/\%[]* *E69* *E70* *E369* */\%[]* *E69* *E70* *E369*
\%[] A sequence of optionally matched atoms. This always matches. \%[] A sequence of optionally matched atoms. This always matches.

16
runtime/doc/usr_24.txt
View File

@@ -538,8 +538,8 @@ a 16 bit and a 32 bit number (e.g., for a Unicode character): >
*24.9* Digraphs *24.9* Digraphs
Some characters are not on the keyboard. For example, the copyright character Some characters are not on the keyboard. For example, the copyright character
(<EFBFBD>). To type these characters in Vim, you use digraphs, where two characters (©). To type these characters in Vim, you use digraphs, where two characters
represent one. To enter a <EFBFBD>, for example, you press three keys: > represent one. To enter a ©, for example, you press three keys: >
CTRL-K Co CTRL-K Co
@@ -549,12 +549,12 @@ To find out what digraphs are available, use the following command: >
Vim will display the digraph table. Here are three lines of it: Vim will display the digraph table. Here are three lines of it:
AC ~_ 159 NS | 160 !I <EFBFBD> 161 Ct <EFBFBD> 162 Pd <EFBFBD> 163 Cu <EFBFBD> 164 Ye <EFBFBD> 165 ~ AC ~_ 159 NS | 160 !I ¡ 161 Ct ¢ 162 Pd £ 163 Cu ¤ 164 Ye ¥ 165 ~
BB <EFBFBD> 166 SE <EFBFBD> 167 ': <EFBFBD> 168 Co <EFBFBD> 169 -a <EFBFBD> 170 << <EFBFBD> 171 NO <EFBFBD> 172 ~ BB ¦ 166 SE § 167 ': ¨ 168 Co © 169 -a ª 170 << « 171 NO ¬ 172 ~
-- <EFBFBD> 173 Rg <EFBFBD> 174 'm <EFBFBD> 175 DG <EFBFBD> 176 +- <EFBFBD> 177 2S <EFBFBD> 178 3S <EFBFBD> 179 ~ -- ­ 173 Rg ® 174 'm ¯ 175 DG ° 176 +- ± 177 2S ² 178 3S ³ 179 ~
This shows, for example, that the digraph you get by typing CTRL-K Pd is the This shows, for example, that the digraph you get by typing CTRL-K Pd is the
character (<EFBFBD>). This is character number 163 (decimal). character (£). This is character number 163 (decimal).
Pd is short for Pound. Most digraphs are selected to give you a hint about Pd is short for Pound. Most digraphs are selected to give you a hint about
the character they will produce. If you look through the list you will the character they will produce. If you look through the list you will
understand the logic. understand the logic.
@@ -569,9 +569,9 @@ that combination. Thus CTRL-K dP also works. Since there is no digraph for
You can define your own digraphs. Example: > You can define your own digraphs. Example: >
:digraph a" <EFBFBD> :digraph a" ä
This defines that CTRL-K a" inserts an <EFBFBD> character. You can also specify the This defines that CTRL-K a" inserts an ä character. You can also specify the
character with a decimal number. This defines the same digraph: > character with a decimal number. This defines the same digraph: >
:digraph a" 228 :digraph a" 228

22
runtime/ftplugin/python.vim
View File

@@ -3,7 +3,7 @@
" Maintainer: Tom Picton <tom@tompicton.co.uk> " Maintainer: Tom Picton <tom@tompicton.co.uk>
" Previous Maintainer: James Sully <sullyj3@gmail.com> " Previous Maintainer: James Sully <sullyj3@gmail.com>
" Previous Maintainer: Johannes Zellner <johannes@zellner.org> " Previous Maintainer: Johannes Zellner <johannes@zellner.org>
" Last Change: Wed, 20 December 2017 " Last Change: Sun, 18 March 2018
" https://github.com/tpict/vim-ftplugin-python " https://github.com/tpict/vim-ftplugin-python
if exists("b:did_ftplugin") | finish | endif if exists("b:did_ftplugin") | finish | endif
@@ -14,7 +14,25 @@ set cpo&vim
setlocal cinkeys-=0# setlocal cinkeys-=0#
setlocal indentkeys-=0# setlocal indentkeys-=0#
setlocal include=^\\s*\\(from\\\|import\\) setlocal include=^\\s*\\(from\\\|import\\)
setlocal includeexpr=substitute(v:fname,'\\.','/','g')
" For imports with leading .., append / and replace additional .s with ../
let b:grandparent_match = '^\(.\.\)\(\.*\)'
let b:grandparent_sub = '\=submatch(1)."/".repeat("../",strlen(submatch(2)))'
" For imports with a single leading ., replace it with ./
let b:parent_match = '^\.\(\.\)\@!'
let b:parent_sub = './'
" Replace any . sandwiched between word characters with /
let b:child_match = '\(\w\)\.\(\w\)'
let b:child_sub = '\1/\2'
setlocal includeexpr=substitute(substitute(substitute(
\v:fname,
\b:grandparent_match,b:grandparent_sub,''),
\b:parent_match,b:parent_sub,''),
\b:child_match,b:child_sub,'g')
setlocal suffixesadd=.py setlocal suffixesadd=.py
setlocal comments=b:#,fb:- setlocal comments=b:#,fb:-
setlocal commentstring=#\ %s setlocal commentstring=#\ %s

8
runtime/indent/html.vim
View File

@@ -2,7 +2,7 @@
" Header: "{{{ " Header: "{{{
" Maintainer: Bram Moolenaar " Maintainer: Bram Moolenaar
" Original Author: Andy Wokula <anwoku@yahoo.de> " Original Author: Andy Wokula <anwoku@yahoo.de>
" Last Change: 2018 Mar 09 " Last Change: 2018 Mar 12
" Version: 1.0 " Version: 1.0
" Description: HTML indent script with cached state for faster indenting on a " Description: HTML indent script with cached state for faster indenting on a
" range of lines. " range of lines.
@@ -233,9 +233,9 @@ call s:AddITags(s:indent_tags, [
call s:AddITags(s:indent_tags, [ call s:AddITags(s:indent_tags, [
\ 'area', 'article', 'aside', 'audio', 'bdi', 'canvas', \ 'area', 'article', 'aside', 'audio', 'bdi', 'canvas',
\ 'command', 'data', 'datalist', 'details', 'embed', 'figcaption', \ 'command', 'data', 'datalist', 'details', 'embed', 'figcaption',
\ 'figure', 'footer', 'header', 'keygen', 'mark', 'meter', 'nav', 'output', \ 'figure', 'footer', 'header', 'keygen', 'main', 'mark', 'meter',
\ 'progress', 'rp', 'rt', 'ruby', 'section', 'source', 'summary', 'svg', \ 'nav', 'output', 'progress', 'rp', 'rt', 'ruby', 'section', 'source',
\ 'time', 'track', 'video', 'wbr']) \ 'summary', 'svg', 'time', 'track', 'video', 'wbr'])
" Tags added for web components: " Tags added for web components:
call s:AddITags(s:indent_tags, [ call s:AddITags(s:indent_tags, [