From 0bc303430b7d5eb7647faa78de88396c439c3bbd Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sat, 26 Dec 2015 11:42:46 +0900
Subject: [PATCH] Rename to g:neosnippet#enable_completed_snippet

---
 autoload/neosnippet.vim          | 3 ++-
 autoload/neosnippet/handlers.vim | 2 +-
 autoload/neosnippet/util.vim     | 5 ++++-
 doc/neosnippet.txt               | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/autoload/neosnippet.vim b/autoload/neosnippet.vim
index 5e6d6a6..dfccf38 100644
--- a/autoload/neosnippet.vim
+++ b/autoload/neosnippet.vim
@@ -42,7 +42,8 @@ call neosnippet#util#set_default(
 call neosnippet#util#set_default(
       \ 'g:neosnippet#enable_conceal_markers', 1)
 call neosnippet#util#set_default(
-      \ 'g:neosnippet#enable_complete_done', 0)
+      \ 'g:neosnippet#enable_completed_snippet', 0,
+      \ 'g:neosnippet#enable_complete_done')
 call neosnippet#util#set_default(
       \ 'g:neosnippet#enable_auto_clear_markers', 1)
 "}}}
diff --git a/autoload/neosnippet/handlers.vim b/autoload/neosnippet/handlers.vim
index 8d7d30e..ce15fc7 100644
--- a/autoload/neosnippet/handlers.vim
+++ b/autoload/neosnippet/handlers.vim
@@ -28,7 +28,7 @@ set cpo&vim
 
 function! neosnippet#handlers#_complete_done() "{{{
   if empty(v:completed_item)
-        \ || !g:neosnippet#enable_complete_done
+        \ || !g:neosnippet#enable_completed_snippet
         \ || v:completed_item.word !~ '($'
     return
   endif
diff --git a/autoload/neosnippet/util.vim b/autoload/neosnippet/util.vim
index ece720c..d678715 100644
--- a/autoload/neosnippet/util.vim
+++ b/autoload/neosnippet/util.vim
@@ -91,7 +91,10 @@ function! neosnippet#util#expand(path) "{{{
         \ expand(escape(a:path, '*?[]"={}'), 1))
 endfunction"}}}
 function! neosnippet#util#set_default(var, val, ...)  "{{{
-  if !exists(a:var)
+  let old_var = get(a:000, 0, '')
+  if exists(old_var)
+    let {a:var} = {old_var}
+  elseif !exists(a:var)
     let {a:var} = a:val
   endif
 endfunction"}}}
diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt
index 6e4ab65..6db6524 100755
--- a/doc/neosnippet.txt
+++ b/doc/neosnippet.txt
@@ -228,8 +228,8 @@ g:neosnippet#enable_conceal_markers
 
 		The default value is 1.
 
-					*g:neosnippet#enable_complete_done*
-g:neosnippet#enable_complete_done
+					*g:neosnippet#enable_completed_snippet*
+g:neosnippet#enable_completed_snippet
 		If this variable is not 0, neosnippet will expand the function
 		prototype when |CompleteDone| autocmd.