Fix bug when filetype changes

Author: suy

doc/context-commentstring.txt

@@ -140,6 +140,10 @@ plugin author.
 ==============================================================================
 CHANGELOG				*context-commentstring-changelog*
 
+0.1.1	2014-06-06
+	- Clear the autocommand always, in case the filetype is changed for
+	  whatever reason.
+
 0.1.0	2013-06-06
 	- First public release.
 

plugin/context-commentstring.vim

@@ -1,5 +1,5 @@
 " This file is part of vim-context_commentstring.
-" Copyright: © 2013 Alejandro Exojo Piqueras <http://disperso.net/>
+" Copyright: © 2013-2014 Alejandro Exojo Piqueras <http://disperso.net/>
 " License: MIT (see doc for details).
 
 if exists('g:loaded_context_commentstring')
@@ -9,18 +9,20 @@ endif
 
 augroup ContextCommentstringBootstrap
 	autocmd!
-	autocmd FileType * call <SID>Bootstrap()
+	autocmd FileType * call <SID>Setup()
 augroup END
 
 
-function! s:Bootstrap()
-	if !empty(&filetype) && has_key(g:context#commentstring#table, &filetype)
-		let b:original_commentstring=&l:commentstring
-		augroup ContextCommentstringEnabled
-			autocmd!
+function! s:Setup()
+	augroup ContextCommentstringEnabled
+		" Clear previous autocommands first in all cases, in case the filetype
+		" changed from something in the table, to something NOT in the table.
+		autocmd! CursorMoved <buffer>
+		if !empty(&filetype) && has_key(g:context#commentstring#table, &filetype)
+			let b:original_commentstring=&l:commentstring
 			autocmd CursorMoved <buffer> call <SID>UpdateCommentString()
-		augroup END
-	endif
+		endif
+	augroup END
 endfunction