Skip to content

Commit

Permalink
Version 4.1 Fatal: split default snippets repository
Browse files Browse the repository at this point in the history
  • Loading branch information
Shougo committed Jan 11, 2014
1 parent dcf2d85 commit 5dba6a0
Show file tree
Hide file tree
Showing 48 changed files with 43 additions and 4,586 deletions.
33 changes: 22 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,15 @@ snipMate.vim or snippetsEmu.vim. But since you can choose snippets with the
have less trouble using them, because you do not have to remember each snippet
name.

Note: Default snippets are required! You must install them or disable runtime
snippets by `g:neosnippet#disable_runtime_snippets`.

Default snippets files are available in:
[neosnippet-snippets](https://github.com/Shougo/neosnippet-snippets)

Note: neocomplcache/neocomplete is NOT required! But recommended.

Extra snippets files are available in:
[neosnippet-snippets](https://github.com/Shougo/neosnippet-snippets)
[vim-snippets](https://github.com/honza/vim-snippets)

Installation
Expand All @@ -28,40 +33,46 @@ required files into your `.vim` folder.

1. Install the
[neocomplcache](https://github.com/Shougo/neocomplcache.vim)/
[neocomplete](https://github.com/Shougo/neocomplete.vim) plugin first.
[neocomplete](https://github.com/Shougo/neocomplete.vim) and
[neosnippet-snippets](https://github.com/Shougo/neosnippet-snippets)
first.
2. Put files in your Vim directory (usually `~/.vim/` or
`%PROGRAMFILES%/Vim/vimfiles` on Windows).

### Vundle
### Vundle

1. Setup the [vundle](https://github.com/gmarik/vundle) package manager
2. Set the bundles for [Neocomplcache](https://github.com/Shougo/neocomplcache)
2. Set the bundles for [neocomplcache](https://github.com/Shougo/neocomplcache)
or [neocomplete](https://github.com/Shougo/neocomplete.vim)
And [Neosnippet](https://github.com/Shougo/neosnippet)
And [neosnippet](https://github.com/Shougo/neosnippet)
And [neosnippet-snippets](https://github.com/Shougo/neosnippet-snippets)

```vim
Bundle 'Shougo/neocomplcache'
or
Bundle 'Shougo/neocomplete'
Bundle 'Shougo/neosnippet'
Bundle 'Shougo/neosnippet-snippets'
```

3. Open up Vim and start installation with `:BundleInstall`

### Neobundle
### Neobundle

1. Setup the [neobundle](https://github.com/Shougo/neobundle.vim) package manager
2. Set the bundles for [Neocomplcache](https://github.com/Shougo/neocomplcache)
1. Setup the [neobundle](https://github.com/Shougo/neobundle.vim) package manager
2. Set the bundles for [neocomplcache](https://github.com/Shougo/neocomplcache)
or [neocomplete](https://github.com/Shougo/neocomplete.vim)
And [Neosnippet](https://github.com/Shougo/neosnippet)
And [neosnippet](https://github.com/Shougo/neosnippet)
And [neosnippet-snippets](https://github.com/Shougo/neosnippet-snippets)

```vim
NeoBundle 'Shougo/neocomplcache'
or
NeoBundle 'Shougo/neocomplete'
NeoBundle 'Shougo/neosnippet'
NeoBundle 'Shougo/neosnippet-snippets'
```

3. Open up Vim and start installation with `:NeoBundleInstall`
Expand All @@ -73,7 +84,7 @@ required files into your `.vim` folder.
2. Add `neosnippet` to the list of addons in your vimrc:

```vim
call vam#ActivateAddons(['neosnippet'])
call vam#ActivateAddons(['neosnippet', 'neosnippet-snippets'])
```

. Installation will start automatically when you open vim next time.
Expand Down Expand Up @@ -115,7 +126,7 @@ built-in ones, then you can set a path to the snippets with
the `g:neosnippet#snippets_directory` variable (e.g [Honza's
Snippets](https://github.com/honza/vim-snippets))

But if you enable g:neosnippet#enable_snipmate_compatibility, neosnippet will
But if you enable `g:neosnippet#enable_snipmate_compatibility`, neosnippet will
load snipMate snippets from runtime path automatically.

```vim
Expand Down
6 changes: 6 additions & 0 deletions autoload/neosnippet/init.vim
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,12 @@ function! s:initialize_script_variables() "{{{
" Set runtime dir.
let runtime_dir = neosnippet#variables#runtime_dir()
let runtime_dir += split(globpath(&runtimepath, 'neosnippets'), '\n')
if empty(runtime_dir) && !g:neosnippet#disable_runtime_snippets
call neosnippet#util#print_error(
\ 'neosnippet default snippets cannot be loaded.')
call neosnippet#util#print_error(
\ 'You must install neosnippet-snippets or disable runtime snippets.')
endif
if g:neosnippet#enable_snipmate_compatibility
" Load snipMate snippet directories.
let runtime_dir += split(globpath(&runtimepath,
Expand Down
17 changes: 15 additions & 2 deletions doc/neosnippet.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
*neosnippet.txt*
The neo-snippet plugin contains snippet source

Version: 4.0
Version: 4.1
Author: Shougo <Shougo.Matsu@gmail.com>
License: MIT license {{{
Permission is hereby granted, free of charge, to any person obtaining
Expand Down Expand Up @@ -54,10 +54,15 @@ Note: If you want to complete snippets, you must install neocomplcache
(https://github.com/Shougo/neocomplcache.vim) or
neocomplete(https://github.com/Shougo/neocomplete.vim).

Note: Default snippets are required! You must install them or disable runtime
snippets by |g:neosnippet#disable_runtime_snippets|.

Default snippets files are available in:
https://github.com/Shougo/neosnippet-snippets

Note: neocomplcache or neocomplete is NOT required! But recommended.

Extra snippets files are available in:
https://github.com/Shougo/neosnippet-snippets
https://github.com/honza/vim-snippets

Note: To enable context filetype feature, you must install
Expand Down Expand Up @@ -744,5 +749,13 @@ Q: I want to delete markers when InsertLeave event.
A: You can use |:NeoSnippetClearMarkers| command. >
autocmd InsertLeave * NeoSnippetClearMarkers
Q: Why did you split default snippets?

A: Because, users should choose default snippet collection.
neosnippet has many forks, but almost forked users change default snippet
files.
https://github.com/Shougo/neosnippet.vim/network
If splitted default snippets, users can fork and change it easily.

==============================================================================
vim:tw=78:ts=8:ft=help:norl:noet:fen:noet:
7 changes: 0 additions & 7 deletions neosnippets/Gemfile.snip

This file was deleted.

25 changes: 0 additions & 25 deletions neosnippets/_.snip

This file was deleted.

Loading

0 comments on commit 5dba6a0

Please sign in to comment.