Skip to content

Commit

Permalink
Merge pull request #742 from guersam/tmp/switch-to-neocomplete
Browse files Browse the repository at this point in the history
Switch to neocomplete from obsolete neocomplcache
  • Loading branch information
spf13 committed May 1, 2015
2 parents 7f9460f + af74fbe commit c2a84a3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
7 changes: 1 addition & 6 deletions .vimrc.bundles
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
" In your .vimrc.before.local file
" list only the plugin groups you will use
if !exists('g:spf13_bundle_groups')
let g:spf13_bundle_groups=['general', 'writing', 'neocomplcache', 'programming', 'php', 'ruby', 'python', 'javascript', 'html', 'misc',]
let g:spf13_bundle_groups=['general', 'writing', 'neocomplete', 'programming', 'php', 'ruby', 'python', 'javascript', 'html', 'misc',]
endif

" To override all the included bundles, add the following to your
Expand Down Expand Up @@ -174,11 +174,6 @@
Bundle 'Valloric/YouCompleteMe'
Bundle 'SirVer/ultisnips'
Bundle 'honza/vim-snippets'
elseif count(g:spf13_bundle_groups, 'neocomplcache')
Bundle 'Shougo/neocomplcache'
Bundle 'Shougo/neosnippet'
Bundle 'Shougo/neosnippet-snippets'
Bundle 'honza/vim-snippets'
elseif count(g:spf13_bundle_groups, 'neocomplete')
Bundle 'Shougo/neocomplete.vim.git'
Bundle 'Shougo/neosnippet'
Expand Down
12 changes: 6 additions & 6 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -300,19 +300,19 @@ filetype. View `help :NERDCommenter` or checkout my post on [NERDCommenter](http

**QuickStart** Toggle comments using `<Leader>c<space>` in Visual or Normal mode.

## [neocomplcache]
## [neocomplete]

NeoComplCache is an amazing autocomplete plugin with additional support for snippets. It can complete simulatiously from the dictionary, buffer, omnicomplete and snippets. This is the one true plugin that brings Vim autocomplete on par with the best editors.
Neocomplete is an amazing autocomplete plugin with additional support for snippets. It can complete simulatiously from the dictionary, buffer, omnicomplete and snippets. This is the one true plugin that brings Vim autocomplete on par with the best editors.

**QuickStart** Just start typing, it will autocomplete where possible

**Customizations**:

* Automatically present the autocomplete menu
* Support tab and enter for autocomplete
* `<C-k>` for completing snippets.
* `<C-k>` for completing snippets using [Neosnippet](https://github.com/Shougo/neosnippet.vim).

![neocomplcache image][autocomplete-img]
![neocomplete image][autocomplete-img]

## [YouCompleteMe]

Expand Down Expand Up @@ -475,7 +475,7 @@ Terminal emulator colorschemes:

## Snippets

It also contains a very complete set of [snippets](https://github.com/spf13/snipmate-snippets) for use with snipmate or [NeoComplCache].
It also contains a very complete set of [snippets](https://github.com/spf13/snipmate-snippets) for use with snipmate or [neocomplete].


# Intro to VIM
Expand Down Expand Up @@ -525,7 +525,7 @@ Here's some tips if you've never used VIM before:
[NERDTree]:https://github.com/scrooloose/nerdtree
[ctrlp]:https://github.com/kien/ctrlp.vim
[solarized]:https://github.com/altercation/vim-colors-solarized
[neocomplcache]:https://github.com/shougo/neocomplcache
[neocomplete]:https://github.com/shougo/neocomplete
[Fugitive]:https://github.com/tpope/vim-fugitive
[Surround]:https://github.com/tpope/vim-surround
[Tagbar]:https://github.com/majutsushi/tagbar
Expand Down

0 comments on commit c2a84a3

Please sign in to comment.