update formatoptions for certain filetypes

3 files changed, 7 insertions, 4 deletions

diff --git a/after/ftplugin/cpp.vim b/after/ftplugin/cpp.vim
index 4d451de..4779a0e 100644
--- a/after/ftplugin/cpp.vim
+++ b/after/ftplugin/cpp.vim
@@ -5,6 +5,10 @@ set softtabstop=2   " number of spaces in tab when editing
 set shiftwidth=2    " number of spaces to use for autoindent
 set expandtab       " expand tab to spaces so that tabs are spaces
 
+" Disable inserting comment leader after hitting o or O or <Enter>
+set formatoptions-=o
+set formatoptions-=r
+
 nnoremap <silent> <buffer> <F9> :call <SID>compile_run_cpp()<CR>
 
 function! s:compile_run_cpp() abort
diff --git a/after/ftplugin/lua.vim b/after/ftplugin/lua.vim
index b611326..c629428 100644
--- a/after/ftplugin/lua.vim
+++ b/after/ftplugin/lua.vim
@@ -1,5 +1,6 @@
-" Disable inserting comment leader after hitting o or O
+" Disable inserting comment leader after hitting o or O or <Enter>
 set formatoptions-=o
+set formatoptions-=r
 
 set tabstop=2       " number of visual spaces per TAB
 set softtabstop=2   " number of spaces in tab when editing
diff --git a/after/ftplugin/vim.vim b/after/ftplugin/vim.vim
index dcbb8e1..12f5c32 100644
--- a/after/ftplugin/vim.vim
+++ b/after/ftplugin/vim.vim
@@ -1,7 +1,5 @@
-" Disable inserting comment leader after hitting o or O
+" Disable inserting comment leader after hitting o or O or <Enter>
 set formatoptions-=o
-
-" Disable inserting comment leader after hitting <Enter> in insert mode
 set formatoptions-=r
 
 " Set the folding related options for vim script. Setting folding option in