diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches/patch-8.1.0948-when-built-without-eval-Vim-clean-produces.patch | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/debian/patches/patch-8.1.0948-when-built-without-eval-Vim-clean-produces.patch b/debian/patches/patch-8.1.0948-when-built-without-eval-Vim-clean-produces.patch index 8544ba9..56e6a4f 100644 --- a/debian/patches/patch-8.1.0948-when-built-without-eval-Vim-clean-produces.patch +++ b/debian/patches/patch-8.1.0948-when-built-without-eval-Vim-clean-produces.patch @@ -11,8 +11,6 @@ Solution: Do not enable filetype detection. src/version.c | 2 ++ 2 files changed, 30 insertions(+), 23 deletions(-) -diff --git a/runtime/defaults.vim b/runtime/defaults.vim -index b848217..e8a0ff4 100644 --- a/runtime/defaults.vim +++ b/runtime/defaults.vim @@ -1,7 +1,7 @@ @@ -48,11 +46,10 @@ index b848217..e8a0ff4 100644 - \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit' - \ | exe "normal! g`\"" - \ | endif -- --augroup END +" Only do this part when Vim was compiled with the +eval feature. +if 1 -+ + +-augroup END + " Enable file type detection. + " Use the default filetype settings, so that mail gets 'tw' set to 72, + " 'cindent' is on in C files, etc. @@ -80,16 +77,14 @@ index b848217..e8a0ff4 100644 " Convenient command to see the difference between the current buffer and the " file it was loaded from, thus the changes you made. -diff --git a/src/version.c b/src/version.c -index 46f63e7..b59878e 100644 --- a/src/version.c +++ b/src/version.c -@@ -791,6 +791,8 @@ static char *(features[]) = - +@@ -792,6 +792,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ -+/**/ -+ 948, /**/ ++ 948, ++/**/ 884, /**/ + 878, |