vimrc Modified

@@ -38,6 +38,7 @@
 Plugin 'Yggdroot/indentLine'                "Show indentation lines
 Plugin 'masukomi/vim-markdown-folding'      "markdown folding
 
+
 call vundle#end()			    " required
 filetype plugin indent on		    " required
 " Brief help
@@ -69,9 +70,10 @@
 set linebreak			" Allow backspacing over indention, line breaks and insertion start
 set backspace=indent,eol,start	" Backspace behaviour
 set formatoptions+=j	        " Delete comment characters when joining lines.
-autocmd FileType * setlocal formatoptions-=cro    " disable autocommenting
+"autocmd FileType * setlocal formatoptions-=cro    " disable autocommenting
 set matchtime=2
 set conceallevel=0              " disable all concealing
+set nojoinspaces                " don't put 2 spaces after periods when joining lines
 
 set undolevels=200		" Number of undo levels
 set undodir=~/.vim/undo//	" undo files

plugin/theme.vim Modified

@@ -76,3 +76,6 @@
 " character for split barrier
 set fillchars=vert:\ 
 hi VertSplit cterm=bold term=bold ctermbg=12
+
+" remove all underlining, it's ugly
+hi Underlined cterm=none

ftplugin/markdown.vim Modified

@@ -1,4 +1,4 @@
-setlocal textwidth=100
+setlocal textwidth=101
 "setlocal spell spelllang=en_gb
 nnoremap <localleader>c :mkview<CR>gqip:silent loadview<CR>
 

after/ftplugin/markdown.vim Added

@@ -0,0 +1,7 @@
+" Identify HTML comment-like blocks as markdown comments
+setlocal comments+=s:<!---,e:-->
+" couldn't get this to work, so just sticking in <br> where needed
+"setlocal comments+=s:![**,e:](
+
+" auto format paragraphs
+setlocal formatoptions+=a