Skip to content
This repository has been archived by the owner on Apr 3, 2019. It is now read-only.

Commit

Permalink
Merge pull request #24 from bilalq/master
Browse files Browse the repository at this point in the history
Compatibility with Vundle/Pathogen
  • Loading branch information
Fred K. Schott committed May 16, 2013
2 parents ad46c87 + 29aa553 commit 2e8006f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -15,7 +15,7 @@ __More info can be found on the [announcement post!](http://www.fredkschott.com/

##Hello, World(s)!
1. Double-check you have twisted library installed: `pip install twisted`
2. Add client.vim & server.py to your plugin folder: `~/.vim/plugin/`
2. Add client.vim & server.py to your plugin folder: `~/.vim/plugin/` or install through Vundle/Pathogen
3. Open Vim
4. To start a new CoVim server: `:CoVim start [port] [name]`
5. To connect to a running server: `:CoVim connect [host address / 'localhost'] [port] [name]`
Expand Down
9 changes: 6 additions & 3 deletions client.vim → plugin/client.vim
Expand Up @@ -32,8 +32,11 @@ import os
from time import sleep


CoVimServerPath = '~/.vim/plugin/server.py'

# Check for Vundle/Pathogen
if os.path.exists(os.path.expanduser('~') + '/.vim/bundle/CoVim/plugin'):
CoVimServerPath = '~/.vim/bundle/CoVim/plugin/server.py'
else:
CoVimServerPath = '~/.vim/plugin/server.py'

class VimProtocol(Protocol):
def __init__(self, fact):
Expand Down Expand Up @@ -288,4 +291,4 @@ class CoVimScope:
CoVim = CoVimScope()
EOF

com! -nargs=+ CoVim py CoVim.command(<f-args>)
com! -nargs=+ CoVim py CoVim.command(<f-args>)
File renamed without changes.

0 comments on commit 2e8006f

Please sign in to comment.