patch 9.1.0544: filetype: ldapconf files are not recognized

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>

diff --git a/.github/MAINTAINERS b/.github/MAINTAINERS
index 2b72f136faf8f9762bb62402f9cbc4b71efa4395..556a47d7f98933484d3b9c39f96214cc18e95a37 100644 (file)
--- 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 77f209eecadcbe00b26fc62909b2db8eb61636ed..eb4e9043f47d8716673606c4f27f7086317884db 100644 (file)
--- 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 (file)
index 0000000..7055716
--- /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 d6491be4244c9ef5d26e22f4b28b8768e4dee695..2a9e6b4580ef80844211f39e33019f14752bf9ad 100644 (file)
--- 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 6f7c2c05ffcc0cc6b37042e365129615d43cc4fd..536f840ad223f8494cac7ba79edec7a5be45066f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    544,
 /**/
     543,
 /**/