gistfile1.diff

diff --git a/scmdiff.vim b/scmdiff.vim
index 18f4e1b..df11946 100644
--- a/scmdiff.vim
+++ b/scmdiff.vim
@@ -28,6 +28,7 @@ function! s:scmToggle()
 
     if exists('b:scmDiffOn') && b:scmDiffOn == 1
         let b:scmDiffOn = 0
+        hide
         set nodiff
         exe 'bdelete ' . b:scmDiffTmpfile
         echohl DiffDelete | echon "scmdiff Disabled" | echohl None
@@ -106,7 +107,6 @@ function! s:scmDiff(...)
         exe 'bdelete ' . b:scmDiffTmpfile
     endif
 
-    let b:scmDiffOn = 1
     let view = winsaveview()
 
     if a:0 == 1
@@ -150,17 +150,18 @@ function! s:scmDiff(...)
 
     exe 'set filetype=' . ftype
 
-    hide
-    if doWrap == 1  
-        set wrap  "Restore the state of wrap
-    endif
+    " hide
+    " if doWrap == 1  
+    "    set wrap  "Restore the state of wrap
+    " endif
 
-    set foldcolumn=0
-    set foldlevel=100
-    set diffopt= " removed filler so we don't show deleted lines
-    set noscrollbind
+    " set foldcolumn=0
+    " set foldlevel=100
+    " set diffopt= " removed filler so we don't show deleted lines
+    " set noscrollbind
 
     call winrestview(view)
+    let b:scmDiffOn = 1
 
 endfunction