aboutsummaryrefslogtreecommitdiff
path: root/runtime
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-03 02:12:54 -0400
committerGitHub <noreply@github.com>2020-10-03 02:12:54 -0400
commitf6ac375604238c94d3dc3eeb9b82e67417460806 (patch)
tree8a3b978d3daa8cc32bf626daaad54f2d35ae30ec /runtime
parentc10c2fab5b4509a7ff50526b56c669f30ebf87c9 (diff)
parent86ab4a1cb4cbf377d2ddf90f785d811a0be50cfc (diff)
downloadrneovim-f6ac375604238c94d3dc3eeb9b82e67417460806.tar.gz
rneovim-f6ac375604238c94d3dc3eeb9b82e67417460806.tar.bz2
rneovim-f6ac375604238c94d3dc3eeb9b82e67417460806.zip
Merge pull request #13026 from janlazo/vim-8.2.1779
vim-patch:8.1.{2143},8.2.{841,1779,1780,1784,1787}
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt4
-rw-r--r--runtime/filetype.vim2
2 files changed, 4 insertions, 2 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bd61d113fb..beb5e9f4c2 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6505,7 +6505,9 @@ A jump table for the options with a short description can be found at |Q_op|.
>= 12 Every executed function.
>= 13 When an exception is thrown, caught, finished, or discarded.
>= 14 Anything pending in a ":finally" clause.
- >= 15 Every executed Ex command (truncated at 200 characters).
+ >= 15 Every executed Ex command from a script (truncated at 200
+ characters).
+ >= 16 Every executed Ex command
This option can also be set with the "-V" argument. See |-V|.
This option is also set by the |:verbose| command.
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index c464e8cebd..7accc22b3d 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -313,7 +313,7 @@ au BufNewFile,BufRead *.css setf css
au BufNewFile,BufRead *.con setf cterm
" Changelog
-au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch
+au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch,*/debian/changelog
\ setf debchangelog
au BufNewFile,BufRead [cC]hange[lL]og