aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHugo Osvaldo Barrera <hugo@whynothugo.nl>2023-10-20 14:22:56 +0200
committeromni <omni+alpine@hack.org>2024-01-25 10:12:48 +0000
commit05e8181757cd8c3719a8a01d0fd0ebb5cf7ae81b (patch)
treee7dbdadba675e8ec62ee6ef2ed9a697f4698401e
parentd693b72da1ab87a6c207aeed32785da40d2a1a2e (diff)
main/vim: remove filetype override for APKBUILD
Vim's upstream defaults already set `filetype=sh` for APKBUILD files, so this is redundant and effectively a no-op. Context ------- Vim plugins such as ALE or nvim-lspconfig currently enable bash-specific linters when `filetype=bash`. On the other hand, ALE only enables APKBUILD-specific checks if `filetype=apkbuild`. I am working on patches for upstream that introduce a dedicated filetype, 'apkbuild'. This filetype will use the same `sh` highlight rules (so highlighting remains unchanged). This override here negates the effect of such patches. I'd rather remove them now and rely entirely on what upstream does.
-rw-r--r--main/vim/APKBUILD4
-rw-r--r--main/vim/vimrc1
2 files changed, 2 insertions, 3 deletions
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index 6c0c61a7792..ee3b12c3439 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=vim
pkgver=9.1.0
-pkgrel=0
+pkgrel=1
pkgdesc="Improved vi-style text editor"
url="https://www.vim.org/"
arch="all"
@@ -301,5 +301,5 @@ xxd() {
sha512sums="
d7038c5c413bfd1a125a893c0b1d3e498e9ce6b5df7d45ef536faac966ce2846b08fe2982010c31f30b34fda07ba2c6922d795806509d05d73768626edc70374 vim-9.1.0.tar.gz
-9ed58e38fe9d72f934eb507b27c18590c33c648eb7ca2639a9afdcaa1c2c4e0873a4e4252d2b6cc28127d1ded227a1e8ac338c93958526f98a3b66dbdf6afcc8 vimrc
+bb4ac5bd2862754e741e63d7b521fd9e0cb1ac19769b952672928fd26471e9486182cd8a46a7e6f25e5b87759106e642293534c5e90c3c3958308291acb26875 vimrc
"
diff --git a/main/vim/vimrc b/main/vim/vimrc
index 043453c7167..0c2ebe3ce04 100644
--- a/main/vim/vimrc
+++ b/main/vim/vimrc
@@ -12,7 +12,6 @@ set suffixes+=.info,.aux,.log,.dvi,.bbl,.out,.o,.lo
set nomodeline
syntax on
-autocmd BufRead APKBUILD set filetype=sh
if filereadable("/etc/vim/vimrc.local")
source /etc/vim/vimrc.local