diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2021-06-13 18:09:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-13 18:09:11 -0400 |
| commit | 2f0e5e7e67faa469f5d12a66ec084ab9c35d8c6b (patch) | |
| tree | 75b8de1718e5004f2fc2426d3205eb797f2b9733 /runtime | |
| parent | e2bc0bf6656124afc47980210e96c31bd3357bea (diff) | |
| parent | 8f4ba0a46becf631f00179264938f2be131945cd (diff) | |
| download | rneovim-2f0e5e7e67faa469f5d12a66ec084ab9c35d8c6b.tar.gz rneovim-2f0e5e7e67faa469f5d12a66ec084ab9c35d8c6b.tar.bz2 rneovim-2f0e5e7e67faa469f5d12a66ec084ab9c35d8c6b.zip | |
Merge pull request #14802 from janlazo/vim-8.2.1354
vim-patch:8.2.{936,1354,2990}
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/eval.txt | 6 | ||||
| -rw-r--r-- | runtime/filetype.vim | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 5397846042..9f44c016f0 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -3693,6 +3693,8 @@ expand({expr} [, {nosuf} [, {list}]]) *expand()* line number <sflnum> script file line number, also when in a function + <SID> "<SNR>123_" where "123" is the + current script ID |<SID>| <cword> word under the cursor <cWORD> WORD under the cursor <client> the {clientid} of the last received @@ -10193,7 +10195,9 @@ text... {endmarker} Set internal variable {var-name} to a |List| containing the lines of text bounded by the string - {endmarker}. + {endmarker}. The lines of text is used as a + |literal-string|. + {endmarker} must not contain white space. {endmarker} cannot start with a lower case character. The last line should end only with the {endmarker} string without any other character. Watch out for diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 89cc1a8fc5..09a1d1d0e6 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -851,6 +851,9 @@ au BufNewFile,BufRead *.jov,*.j73,*.jovial setf jovial " JSON au BufNewFile,BufRead *.json,*.jsonp,*.webmanifest setf json +" Jupyter Notebook is also json +au BufNewFile,BufRead *.ipynb setf json + " Kixtart au BufNewFile,BufRead *.kix setf kix |