From 9bfd793dfa1af1f0f48f9fa8509050a93c3f23c1 Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Thu, 27 Sep 2012 07:38:16 +0900
Subject: [PATCH] - Improved add placeholder behavior.

---
 autoload/neocomplcache/sources/snippets_complete.vim | 9 +++++----
 doc/neocomplcache-snippets-complete.txt              | 5 ++++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/autoload/neocomplcache/sources/snippets_complete.vim b/autoload/neocomplcache/sources/snippets_complete.vim
index a900223..8ef3dca 100644
--- a/autoload/neocomplcache/sources/snippets_complete.vim
+++ b/autoload/neocomplcache/sources/snippets_complete.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: snippets_complete.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 23 Sep 2012.
+" Last Modified: 27 Sep 2012.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -309,8 +309,8 @@ function! s:set_snippet_pattern(dict)"{{{
         \ g:neocomplcache_max_keyword_width-10)
 
   let a:dict.word = substitute(a:dict.word, '\n$', '', '')
-  let menu_pattern =
-        \ (a:dict.word =~ '\${\d\+\%(:.\{-}\)\?\\\@<!}') ?
+  let menu_pattern = (a:dict.word =~
+        \ s:get_placeholder_marker_substitute_pattern()) ?
         \ '<Snip> ' : '[Snip] '
 
   let abbr = get(a:dict, 'abbr', substitute(a:dict.word,
@@ -459,7 +459,8 @@ function! s:load_snippets(snippet, snippets_file)"{{{
     let linenr += 1
   endfor
 
-  if snippet_pattern.word !~ '\\\@<!${0}'
+  if snippet_pattern.word !~
+        \ s:get_placeholder_marker_substitute_pattern()
     " Add placeholder.
     let snippet_pattern.word .= '${0}'
   endif
diff --git a/doc/neocomplcache-snippets-complete.txt b/doc/neocomplcache-snippets-complete.txt
index 613e0e7..22ee0b9 100644
--- a/doc/neocomplcache-snippets-complete.txt
+++ b/doc/neocomplcache-snippets-complete.txt
@@ -304,7 +304,10 @@ snippet						*neocomplcache-snippets-complete-unite-action-snippet*
 	preview		View snippet definition
 
 ==============================================================================
-CHANGELOG					*neocomplcache-snippets-complete-changelog*
+CHANGELOG			*neocomplcache-snippets-complete-changelog*
+
+2012-09-27
+- Improved add placeholder behavior.
 
 2012-09-23
 - Fixed substitute tab character.