aboutsummaryrefslogtreecommitdiff
path: root/runtime/ftplugin/diff.vim
diff options
context:
space:
mode:
authorChristian Clason <c.clason@uni-graz.at>2021-11-17 10:02:59 +0100
committerGitHub <noreply@github.com>2021-11-17 10:02:59 +0100
commitc0efe49e78eca3a17a5934cc283199122d081467 (patch)
tree8ef8f9fcfb55d3a3d515853e84294f60c6632306 /runtime/ftplugin/diff.vim
parenteba317d7a907a76e6e265c0fe0b97a87f17cf943 (diff)
downloadrneovim-c0efe49e78eca3a17a5934cc283199122d081467.tar.gz
rneovim-c0efe49e78eca3a17a5934cc283199122d081467.tar.bz2
rneovim-c0efe49e78eca3a17a5934cc283199122d081467.zip
vim-patch:519cc559b08b (#16340)
Update runtime files https://github.com/vim/vim/commit/519cc559b08b800edc429688aece7ad6a00d41eb
Diffstat (limited to 'runtime/ftplugin/diff.vim')
-rw-r--r--runtime/ftplugin/diff.vim11
1 files changed, 8 insertions, 3 deletions
diff --git a/runtime/ftplugin/diff.vim b/runtime/ftplugin/diff.vim
index 0464290475..bf37d464c0 100644
--- a/runtime/ftplugin/diff.vim
+++ b/runtime/ftplugin/diff.vim
@@ -1,7 +1,7 @@
" Vim filetype plugin file
" Language: Diff
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2020 Jul 18
+" Last Change: 2021 Nov 14
" Only do this when not done yet for this buffer
if exists("b:did_ftplugin")
@@ -9,10 +9,15 @@ if exists("b:did_ftplugin")
endif
let b:did_ftplugin = 1
-let b:undo_ftplugin = "setl modeline<"
+let b:undo_ftplugin = "setl modeline< commentstring<"
" Don't use modelines in a diff, they apply to the diffed file
setlocal nomodeline
" If there are comments they start with #
-let &commentstring = "# %s"
+let &l:commentstring = "# %s"
+
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
+ let b:browsefilter = "Diff Files (*.diff)\t*.diff\nPatch Files (*.patch)\t*.h\nAll Files (*.*)\t*.*\n"
+ let b:undo_ftplugin ..= " | unlet! b:browsefilter"
+endif