From 84823e5e7d3e2818bbbf3b8a41a8960cbd11353a Mon Sep 17 00:00:00 2001 From: amarakon Date: Fri, 30 Sep 2022 23:14:43 -0400 Subject: [PATCH] Treat R Markdown the same as Markdown --- autoload/airline/extensions/whitespace.vim | 2 +- autoload/airline/extensions/wordcount.vim | 2 +- doc/airline.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autoload/airline/extensions/whitespace.vim b/autoload/airline/extensions/whitespace.vim index c5e9d6f1..67707b14 100644 --- a/autoload/airline/extensions/whitespace.vim +++ b/autoload/airline/extensions/whitespace.vim @@ -52,7 +52,7 @@ endfunction function! s:conflict_marker() " Checks for git conflict markers let annotation = '\%([0-9A-Za-z_.:]\+\)\?' - if match(['rst', 'markdown'], &ft) >= 0 + if match(['rst', 'markdown', 'rmd'], &ft) >= 0 " rst filetypes use '=======' as header let pattern = '^\%(\%(<\{7} '.annotation. '\)\|\%(>\{7\} '.annotation.'\)\)$' else diff --git a/autoload/airline/extensions/wordcount.vim b/autoload/airline/extensions/wordcount.vim index edb7340b..5a800f4e 100644 --- a/autoload/airline/extensions/wordcount.vim +++ b/autoload/airline/extensions/wordcount.vim @@ -92,7 +92,7 @@ endfunction " default filetypes: function! airline#extensions#wordcount#apply(...) let filetypes = get(g:, 'airline#extensions#wordcount#filetypes', - \ ['asciidoc', 'help', 'mail', 'markdown', 'nroff', 'org', 'rst', 'plaintex', 'tex', 'text']) + \ ['asciidoc', 'help', 'mail', 'markdown', 'rmd', 'nroff', 'org', 'rst', 'plaintex', 'tex', 'text']) " export current filetypes settings to global namespace let g:airline#extensions#wordcount#filetypes = filetypes diff --git a/doc/airline.txt b/doc/airline.txt index 295ad6c1..e7943950 100644 --- a/doc/airline.txt +++ b/doc/airline.txt @@ -1556,7 +1556,7 @@ virtualenv < * enable virtualenv for additional filetypes: (default: python): > - let g:airline#extensions#virtualenv#ft = ['python', 'markdown'] + let g:airline#extensions#virtualenv#ft = ['python', 'markdown', 'rmd'] < ------------------------------------- *airline-vista* vista.vim @@ -1662,7 +1662,7 @@ vim-windowswap " The default value matches filetypes typically used for documentation " such as markdown and help files. Default is: let g:airline#extensions#wordcount#filetypes = - \ ['asciidoc', 'help', 'mail', 'markdown', 'nroff', 'org', 'plaintex', 'rst', 'tex', 'text']) + \ ['asciidoc', 'help', 'mail', 'markdown', 'rmd' 'nroff', 'org', 'plaintex', 'rst', 'tex', 'text']) " Use ['all'] to enable for all filetypes. * defines the name of a formatter for word count will be displayed: >