Revert some changes to get back compatibility

xavierd · Nov 19, 2014 · 1330d0c · 1330d0c
1 parent 2f2fdd7
commit 1330d0c
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/plugin/clang_complete.vim b/plugin/clang_complete.vim
@@ -476,13 +476,18 @@ function! s:HandlePossibleSelectionCtrlY()
 endfunction
 
 function! s:TriggerSnippet()
-  execute 'inoremap <script> <buffer> <silent> <CR> '.s:old_cr
+  " Restore original return key mapping
+  silent! execute 'inoremap <script> <buffer> <silent> <CR> '.s:old_cr
+
   " Dont bother doing anything until we're sure the user exited the menu
   if !b:snippet_chosen
     return
   endif
 
   " Stop monitoring as we'll trigger a snippet
+  if empty(s:old_cr)
+    silent! iunmap <buffer> <CR>
+  endif
   silent! iunmap <buffer> <C-Y>
   augroup ClangComplete
     au! CursorMovedI <buffer>