diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 934e4042f6..06167c7274 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -630,6 +630,9 @@ au BufNewFile,BufRead lynx.cfg setf lynx " LyRiCs au BufNewFile,BufRead *.lrc setf lyrics +" Mamba configuration file +au BufNewFile,BufRead .mambarc,mambarc setf yaml + " MLIR au BufNewFile,BufRead *.mlir setf mlir diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 7aa3197875..5dc91696c4 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -935,7 +935,7 @@ def s:GetFilenameChecks(): dict> xslt: ['file.xsl', 'file.xslt'], yacc: ['file.yy', 'file.yxx', 'file.y++'], yaml: ['file.yaml', 'file.yml', 'file.eyaml', 'file.kyaml', 'file.kyml', 'any/.bundle/config', '.clangd', '.clang-format', '.clang-tidy', 'file.mplstyle', 'matplotlibrc', 'yarn.lock', - '/home/user/.kube/config', '/home/user/.kube/kuberc', '.condarc', 'condarc', 'pixi.lock'], + '/home/user/.kube/config', '/home/user/.kube/kuberc', '.condarc', 'condarc', '.mambarc', 'mambarc', 'pixi.lock'], yang: ['file.yang'], yuck: ['file.yuck'], z8a: ['file.z8a'], diff --git a/src/version.c b/src/version.c index a1e0521959..c79b2b23bd 100644 --- a/src/version.c +++ b/src/version.c @@ -724,6 +724,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1775, /**/ 1774, /**/