- Improved vim_complete.

Shougo · Aug 1, 2011 · 452063b · 452063b
1 parent e33d6eb
commit 452063b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/autoload/neocomplcache/sources/vim_complete.vim b/autoload/neocomplcache/sources/vim_complete.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: vim_complete.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 30 Jun 2011.
+" Last Modified: 01 Aug 2011.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -123,9 +123,6 @@ function! s:source.get_complete_words(cur_keyword_pos, cur_keyword_str)"{{{
   elseif a:cur_keyword_str =~ '^\$'
     " Environment.
     let l:list = neocomplcache#sources#vim_complete#helper#environment(l:cur_text, a:cur_keyword_str)
-  elseif l:cur_text =~ '`=[^`]*$'
-    " Expression.
-    let l:list = neocomplcache#sources#vim_complete#helper#expression(l:cur_text, a:cur_keyword_str)
   elseif l:cur_text =~ '^[[:digit:],[:space:][:tab:]$''<>]*!\s*\f\+$'
     " Shell commands.
     let l:list = neocomplcache#sources#vim_complete#helper#shellcmd(l:cur_text, a:cur_keyword_str)

diff --git a/autoload/neocomplcache/sources/vim_complete/helper.vim b/autoload/neocomplcache/sources/vim_complete/helper.vim
@@ -1,7 +1,7 @@
 "=============================================================================
 " FILE: helper.vim
 " AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
-" Last Modified: 23 Jul 2011.
+" Last Modified: 01 Aug 2011.
 " License: MIT license  {{{
 "     Permission is hereby granted, free of charge, to any person obtaining
 "     a copy of this software and associated documentation files (the
@@ -240,7 +240,8 @@ function! neocomplcache#sources#vim_complete#helper#command(cur_text, cur_keywor
 
     let l:list = neocomplcache#sources#vim_complete#helper#get_command_completion(l:command, l:cur_text, a:cur_keyword_str)
 
-    if a:cur_text =~ '[[(,{]'
+    if a:cur_text =~
+          \'[[(,{]\|`=[^`]*$'
       " Expression.
       let l:list += neocomplcache#sources#vim_complete#helper#expression(a:cur_text, a:cur_keyword_str)
     endif

diff --git a/doc/neocomplcache.txt b/doc/neocomplcache.txt
@@ -1030,6 +1030,7 @@ CHANGELOG						*neocomplcache-changelog*
 
 2011-08-01
 - Improved cache loading.
+- Improved vim_complete.
 
 2011-07-31
 - Fixed get_cur_text error.