diff options
| author | Thiago de Arruda <tpadilha84@gmail.com> | 2014-10-21 11:04:52 -0300 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-10-21 11:04:52 -0300 |
| commit | 6e268cd0d40a3652a68b486bdbb421d39295ab48 (patch) | |
| tree | 9eb59975930cb2f22872509b33f75ec7eef4dd0c | |
| parent | 7e1b285c575aefc6120c1444f8d781f956d3cac8 (diff) | |
| parent | fe7db21c73bd0c88b6686e4fa39e53027a03a78e (diff) | |
| download | rneovim-6e268cd0d40a3652a68b486bdbb421d39295ab48.tar.gz rneovim-6e268cd0d40a3652a68b486bdbb421d39295ab48.tar.bz2 rneovim-6e268cd0d40a3652a68b486bdbb421d39295ab48.zip | |
Merge pull request #1319 '[RFC] A few fixes for YCM contrib docs and code'
| -rw-r--r-- | contrib/YouCompleteMe/README.md | 4 | ||||
| -rw-r--r-- | contrib/YouCompleteMe/ycm_extra_conf.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/contrib/YouCompleteMe/README.md b/contrib/YouCompleteMe/README.md index 940f49363b..cd6393cd03 100644 --- a/contrib/YouCompleteMe/README.md +++ b/contrib/YouCompleteMe/README.md @@ -2,7 +2,7 @@ ## What is this? -This provides the necessary to configure vim's YCM plugin to provide C semantic support (completion, go-to-definition, etc) for the neovim project. +This provides the code necessary to configure vim's YCM plugin to provide C semantic support (completion, go-to-definition, etc) for the Neovim project. ## Installation @@ -17,6 +17,6 @@ cp contrib/YouCompleteMe/ycm_extra_conf.py src/.ycm_extra_conf.py echo .ycm_extra_conf.py >> .git/info/exclude make -(somewhere in you .vimrc files) +(Add the following somewhere in your .nvimrc files) autocmd FileType c nnoremap <buffer> <silent> <C-]> :YcmCompleter GoTo<cr> ``` diff --git a/contrib/YouCompleteMe/ycm_extra_conf.py b/contrib/YouCompleteMe/ycm_extra_conf.py index ae5d3d1a36..0066f96dc0 100644 --- a/contrib/YouCompleteMe/ycm_extra_conf.py +++ b/contrib/YouCompleteMe/ycm_extra_conf.py @@ -8,7 +8,8 @@ def DirectoryOfThisScript(): def GetDatabase(): - compilation_database_folder = DirectoryOfThisScript() + '/../build' + compilation_database_folder = os.path.join(DirectoryOfThisScript(), + '..', 'build') if os.path.exists(compilation_database_folder): return ycm_core.CompilationDatabase(compilation_database_folder) return None |