1 files changed, 2 insertions, 0 deletions
diff --git a/vim/vimrc b/vim/vimrc
index 4bca693c..d167ed02 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -72,6 +72,8 @@ set foldlevelstart=99
 set foldmethod=indent
 
 " Automatic formatting options
+set formatoptions+=l  " Don't break a long line in insert mode
+set formatoptions+=1  " Avoid breaking lines after one-letter words
 if vimrc#Version('7.3.541')
   set formatoptions+=j  " Delete comment leaders when joining lines
 endif