From f9f2b5f1770ef165fa49a3e7b28b6daf267fbabc Mon Sep 17 00:00:00 2001
From: Israel Chauca Fuentes <israel@chauca.net>
Date: Tue, 7 Dec 2010 16:59:09 -0600
Subject: [PATCH] Don't leave mappings around.

Some mappings weren't being unmapped on filetype change because options
were initialized before the call to Unmap().
---
 plugin/delimitMate.vim | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/plugin/delimitMate.vim b/plugin/delimitMate.vim
index a8dfd33..7b981ce 100644
--- a/plugin/delimitMate.vim
+++ b/plugin/delimitMate.vim
@@ -217,25 +217,23 @@ function! s:TestMappingsDo() "{{{
 endfunction "}}}
 
 function! s:DelimitMateDo(...) "{{{
-	" Initialize settings:
-	call s:init()
-
-	" Check if this file type is excluded:
-	if exists("g:delimitMate_excluded_ft") &&
-				\ index(split(g:delimitMate_excluded_ft, ','), &filetype, 0, 1) >= 0
-
-			" Remove any magic:
-			call s:Unmap()
-
-			" Finish here:
-			return 1
-	endif
 
 	" First, remove all magic, if needed:
 	if exists("b:delimitMate_enabled") && b:delimitMate_enabled == 1
 		call s:Unmap()
 	endif
 
+	" Check if this file type is excluded:
+	if exists("g:delimitMate_excluded_ft") &&
+				\ index(split(g:delimitMate_excluded_ft, ','), &filetype, 0, 1) >= 0
+
+			" Finish here:
+			return 1
+	endif
+
+	" Initialize settings:
+	call s:init()
+
 	" Now, add magic:
 	call s:Map()
 
@@ -245,12 +243,12 @@ function! s:DelimitMateDo(...) "{{{
 endfunction "}}}
 
 function! s:DelimitMateSwitch() "{{{
-	call s:init()
 	if exists("b:delimitMate_enabled") && b:delimitMate_enabled
 		call s:Unmap()
 		echo "delimitMate has been disabled."
 	else
 		call s:Unmap()
+		call s:init()
 		call s:Map()
 		echo "delimitMate has been enabled."
 	endif