From 20f82b2e02d009315dde2430a0417137d4ab312a Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Mon, 7 Jan 2013 10:37:02 +0900
Subject: [PATCH] - Changed neosnippet#expandable() behavior.

---
 autoload/neosnippet.vim | 19 +++----------------
 doc/neosnippet.txt      | 18 ++++++++----------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/autoload/neosnippet.vim b/autoload/neosnippet.vim
index cf28a06..5fc6873 100644
--- a/autoload/neosnippet.vim
+++ b/autoload/neosnippet.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: neosnippet.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 02 Jan 2013.
+" Last Modified: 07 Jan 2013.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -80,22 +80,9 @@ endfunction"}}}
 "}}}
 
 function! neosnippet#expandable() "{{{
-  let ret = 0
-
-  let snippets = neosnippet#get_snippets()
-  let cur_text = neosnippet#util#get_cur_text()
-
   " Check snippet trigger.
-  if s:get_cursor_snippet(snippets, cur_text) != ''
-    let ret += 1
-  endif
-
-  " Check jumpable.
-  if neosnippet#jumpable()
-    let ret += 2
-  endif
-
-  return ret
+  return s:get_cursor_snippet(
+        \ neosnippet#get_snippets(), neosnippet#util#get_cur_text()) != ''
 endfunction"}}}
 function! neosnippet#jumpable() "{{{
   " Found snippet placeholder.
diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt
index 2f5b420..c772dd6 100755
--- a/doc/neosnippet.txt
+++ b/doc/neosnippet.txt
@@ -285,15 +285,10 @@ neosnippet#expandable()
 						*neosnippet#expandable()*
 		You can use this function with imap <expr>. It checks whether
 		the cursor text is a snippet trigger or a placeholder. This is
-		is useful to save key mappings. The return values of the
-		function are:
-	
-	        0: not found
-		1: the cursor text is a snippet trigger
-		2: a placeholder exists in the current buffer
-		3: both found
+		is useful to save key mappings.
 >
-		imap <expr><C-l> neosnippet#expandable() ?
+		imap <expr><C-l>
+		\ neosnippet#expandable() || neosnippet#jumpable() ?
 		\ "\<Plug>(neosnippet_expand_or_jump)" : "\<C-n>"
 <
 		*neocomplcache#sources#snippets_complete#expandable()*
@@ -338,10 +333,10 @@ EXAMPLES					*neosnippet-examples*
 	xmap <C-l>     <Plug>(neosnippet_start_unite_snippet_target)
 
 	" SuperTab like snippets behavior.
-	"imap <expr><TAB> neosnippet#expandable() ?
+	"imap <expr><TAB> neosnippet#expandable() || neosnippet#jumpable() ?
 	" \ "\<Plug>(neosnippet_expand_or_jump)"
 	" \: pumvisible() ? "\<C-n>" : "\<TAB>"
-	"smap <expr><TAB> neosnippet#expandable() ?
+	"smap <expr><TAB> neosnippet#expandable() || neosnippet#jumpable() ?
 	" \ "\<Plug>(neosnippet_expand_or_jump)"
 	" \: "\<TAB>"
 
@@ -711,6 +706,9 @@ A: Please try below settings. It defines snipMate function.
 ==============================================================================
 CHANGELOG			*neosnippet-changelog*
 
+2013-01-07
+- Changed neosnippet#expandable() behavior.
+
 2013-01-02
 - Improved initialization timing.