From bdc7f9cb5b298dc06808bf9c688f70a4c06fadad Mon Sep 17 00:00:00 2001
From: Shougo Matsushita <Shougo.Matsu@gmail.com>
Date: Sun, 13 Jan 2013 08:08:51 +0900
Subject: [PATCH] - Added neobundle#expandable_or_jumpable().

---
 README.md               |  4 ++--
 autoload/neosnippet.vim |  5 ++++-
 doc/neosnippet.txt      | 36 ++++++++++++++++++++++--------------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 46bbb3b..0a0a0b5 100644
--- a/README.md
+++ b/README.md
@@ -65,8 +65,8 @@ imap <C-k>     <Plug>(neosnippet_expand_or_jump)
 smap <C-k>     <Plug>(neosnippet_expand_or_jump)
 
 " SuperTab like snippets behavior.
-imap <expr><TAB> neosnippet#expandable() <Bar><bar> neosnippet#jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
-smap <expr><TAB> neosnippet#expandable() <Bar><bar> neosnippet#jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
+imap <expr><TAB> neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : pumvisible() ? "\<C-n>" : "\<TAB>"
+smap <expr><TAB> neosnippet#expandable_or_jumpable() ? "\<Plug>(neosnippet_expand_or_jump)" : "\<TAB>"
 
 " For snippet_complete marker.
 if has('conceal')
diff --git a/autoload/neosnippet.vim b/autoload/neosnippet.vim
index 5fc6873..f836d27 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: 07 Jan 2013.
+" Last Modified: 13 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
@@ -79,6 +79,9 @@ function! s:doc_dict.search(cur_text) "{{{
 endfunction"}}}
 "}}}
 
+function! neosnippet#expandable_or_jumpable() "{{{
+  return neosnippet#expandable() || neosnippet#jumpable()
+endfunction"}}}
 function! neosnippet#expandable() "{{{
   " Check snippet trigger.
   return s:get_cursor_snippet(
diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt
index fd5b20f..5ce1dc2 100755
--- a/doc/neosnippet.txt
+++ b/doc/neosnippet.txt
@@ -284,17 +284,12 @@ x_<Plug>(neosnippet_register_oneshot_snippet)
 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 cursor text is a snippet trigger. This is is useful to
+		save key mappings.
 		Note: If you used to
 		|neocomplcache#sources#snippets_complete#expandable()|, you
-		must use both |neosnippet#expandable()| and
-		|neosnippet#jumpable()|.
->
-		imap <expr><C-l>
-		\ neosnippet#expandable() <Bar><bar> neosnippet#jumpable() ?
-		\ "\<Plug>(neosnippet_expand_or_jump)" : "\<C-n>"
-<
+		must use |neosnippet#expandable_or_jumpable()|.
+
 		*neocomplcache#sources#snippets_complete#expandable()*
 		*neocomplcache#sources#snippets_complete#force_expandable()*
 		Note:
@@ -305,14 +300,24 @@ neosnippet#expandable()
 
 neosnippet#jumpable()
 						*neosnippet#jumpable()*
-		Use this function with imap <expr>. It checks if the cursor
-		text is an existing placeholder in current buffer. This is
-		useful to save key mappings.
+		You can use this function with imap <expr>. It checks if the
+		cursor text is an existing placeholder in current buffer. This
+		is useful to save key mappings.
 
 		*neocomplcache#sources#snippets_complete#jumpable()*
 		Note: |neocomplcache#sources#snippets_complete#jumpable()| is
 		an obsolete name.
 
+neosnippet#expandable_or_jumpable()
+					*neosnippet#expandable_or_jumpable()*
+		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.
+>
+		imap <expr><C-l>
+		\ neosnippet#expandable_or_jumpable() ?
+		\ "\<Plug>(neosnippet_expand_or_jump)" : "\<C-n>"
+<
 ------------------------------------------------------------------------------
 FUNCTIONS					*neosnippet-functions*
 
@@ -337,10 +342,10 @@ EXAMPLES					*neosnippet-examples*
 	xmap <C-l>     <Plug>(neosnippet_start_unite_snippet_target)
 
 	" SuperTab like snippets behavior.
-	"imap <expr><TAB> neosnippet#expandable() <Bar><bar> neosnippet#jumpable() ?
+	"imap <expr><TAB> neosnippet#expandable_or_jumpable() ?
 	" \ "\<Plug>(neosnippet_expand_or_jump)"
 	" \: pumvisible() ? "\<C-n>" : "\<TAB>"
-	"smap <expr><TAB> neosnippet#expandable() <Bar><bar> neosnippet#jumpable() ?
+	"smap <expr><TAB> neosnippet#expandable_or_jumpable() ?
 	" \ "\<Plug>(neosnippet_expand_or_jump)"
 	" \: "\<TAB>"
 
@@ -710,6 +715,9 @@ A: Please try below settings. It defines snipMate function.
 ==============================================================================
 CHANGELOG			*neosnippet-changelog*
 
+2013-01-13
+- Added neosnippet#expandable_or_jumpable().
+
 2013-01-07
 - Changed neosnippet#expandable() behavior.