summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRiley Bruins <ribru17@hotmail.com>2024-07-07 21:20:22 +0200
committerChristian Brabandt <cb@256bit.org>2024-07-07 21:20:22 +0200
commit62f31e949918167cb7f50cdf1737f7c28460b62b (patch)
tree9073df01e3d200b1ad1b45e556668b271c3c8d15
parentf77a0e9f417d41a3c35de86a42a75d10b633f19a (diff)
patch 9.1.0544: filetype: ldapconf files are not recognizedv9.1.0544
Problem: filetype: ldapconf files are not recognized Solution: Detect '.ldaprc', 'ldap.conf' and 'ldaprc' files as ldapconf filetype, include a simple ldapconf ftplugin file (Riley Bruins) [Specification](https://www.openldap.org/software//man.cgi?query=ldap.conf&sektion=5&apropos=0&manpath=OpenLDAP+2.4-Release) closes: #15176 Signed-off-by: Riley Bruins <ribru17@hotmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
-rw-r--r--.github/MAINTAINERS1
-rw-r--r--runtime/filetype.vim3
-rw-r--r--runtime/ftplugin/ldapconf.vim13
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
5 files changed, 20 insertions, 0 deletions
diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 2b72f136fa..556a47d7f9 100644
--- a/.github/MAINTAINERS
+++ b/.github/MAINTAINERS
@@ -187,6 +187,7 @@ runtime/ftplugin/kconfig.vim @chrisbra
runtime/ftplugin/kdl.vim @imsnif @jiangyinzuo
runtime/ftplugin/kivy.vim @ribru17
runtime/ftplugin/kotlin.vim @udalov
+runtime/ftplugin/ldapconf.vim @ribru17
runtime/ftplugin/less.vim @genoma
runtime/ftplugin/lex.vim @ribru17
runtime/ftplugin/liquid.vim @tpope
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 77f209eeca..eb4e9043f4 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1250,6 +1250,9 @@ au BufNewFile,BufRead */etc/limits,*/etc/*limits.conf,*/etc/*limits.d/*.conf set
" LambdaProlog or SML (see dist#ft#FTmod for *.mod)
au BufNewFile,BufRead *.sig call dist#ft#FTsig()
+" LDAP configuration
+au BufNewFile,BufRead ldaprc,.ldaprc,ldap.conf setf ldapconf
+
" LDAP LDIF
au BufNewFile,BufRead *.ldif setf ldif
diff --git a/runtime/ftplugin/ldapconf.vim b/runtime/ftplugin/ldapconf.vim
new file mode 100644
index 0000000000..70557160e8
--- /dev/null
+++ b/runtime/ftplugin/ldapconf.vim
@@ -0,0 +1,13 @@
+" Vim filetype plugin
+" Language: ldap.conf(5) configuration file.
+" Maintainer: Riley Bruins <ribru17@gmail.com>
+" Last Change: 2024 Jul 06
+
+if exists('b:did_ftplugin')
+ finish
+endif
+let b:did_ftplugin = 1
+
+setl comments=:# commentstring=#\ %s
+
+let b:undo_ftplugin = 'setl com< cms<'
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index d6491be424..2a9e6b4580 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -385,6 +385,7 @@ def s:GetFilenameChecks(): dict<list<string>>
lace: ['file.ace', 'file.ACE'],
latte: ['file.latte', 'file.lte'],
ld: ['file.ld', 'any/usr/lib/aarch64-xilinx-linux/ldscripts/aarch64elf32b.x'],
+ ldapconf: ['ldap.conf', '.ldaprc', 'ldaprc'],
ldif: ['file.ldif'],
lean: ['file.lean'],
ledger: ['file.ldg', 'file.ledger', 'file.journal'],
diff --git a/src/version.c b/src/version.c
index 6f7c2c05ff..536f840ad2 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 544,
+/**/
543,
/**/
542,