aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2021-01-17 15:01:22 -0500
committerGitHub <noreply@github.com>2021-01-17 15:01:22 -0500
commit702208daa6553ecfc3939c3c6e9fcd94fdd5aeba (patch)
tree132f9cd8d97e44e14537e37296641681307709cf /runtime
parent0f2d37f11fac7eed4617684bad2771e864818a8f (diff)
parent7cced24e93c4046b010ee4a622f288387df3bc75 (diff)
downloadrneovim-702208daa6553ecfc3939c3c6e9fcd94fdd5aeba.tar.gz
rneovim-702208daa6553ecfc3939c3c6e9fcd94fdd5aeba.tar.bz2
rneovim-702208daa6553ecfc3939c3c6e9fcd94fdd5aeba.zip
Merge pull request #13775 from janlazo/vim-8.2.2353
vim-patch:8.2.{2353,2355,2360,2361,2366,2368}
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/index.txt2
-rw-r--r--runtime/doc/various.txt4
-rw-r--r--runtime/filetype.vim3
3 files changed, 7 insertions, 2 deletions
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 17de1d8533..172821ac28 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1543,6 +1543,8 @@ tag command action ~
|:sign| :sig[n] manipulate signs
|:silent| :sil[ent] run a command silently
|:sleep| :sl[eep] do nothing for a few seconds
+|:sleep!| :sl[eep]! do nothing for a few seconds, without the
+ cursor visible
|:slast| :sla[st] split window and go to last file in the
argument list
|:smagic| :sm[agic] :substitute with 'magic'
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index b6885d6e25..5fb7c4ce50 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -489,12 +489,12 @@ gO Show a filetype-specific, navigable "outline" of the
Currently works in |help| and |:Man| buffers.
[N]gs *gs* *:sl* *:sleep*
-:[N]sl[eep] [N] [m] Do nothing for [N] seconds, or [N] milliseconds if [m]
+:[N]sl[eep] [N][m] Do nothing for [N] seconds, or [N] milliseconds if [m]
was given. "gs" always uses seconds.
Default is one second. >
:sleep "sleep for one second
:5sleep "sleep for five seconds
- :sleep 100m "sleep for a hundred milliseconds
+ :sleep 100m "sleep for 100 milliseconds
10gs "sleep for ten seconds
< Can be interrupted with CTRL-C.
"gs" stands for "goto sleep".
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ba81a3348e..9104519451 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1620,6 +1620,9 @@ au BufNewFile,BufRead *.mib,*.my setf mib
au BufNewFile,BufRead *.hog,snort.conf,vision.conf setf hog
au BufNewFile,BufRead *.rules call dist#ft#FTRules()
+" SPARQL queries
+au BufNewFile,BufRead *.rq,*.sparql setf sparql
+
" Spec (Linux RPM)
au BufNewFile,BufRead *.spec setf spec