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

Commit 2e8006f

Browse files
author
Fred K. Schott
committed
Merge pull request #24 from bilalq/master
Compatibility with Vundle/Pathogen
2 parents ad46c87 + 29aa553 commit 2e8006f

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ __More info can be found on the [announcement post!](http://www.fredkschott.com/
1515

1616
##Hello, World(s)!
1717
1. Double-check you have twisted library installed: `pip install twisted`
18-
2. Add client.vim & server.py to your plugin folder: `~/.vim/plugin/`
18+
2. Add client.vim & server.py to your plugin folder: `~/.vim/plugin/` or install through Vundle/Pathogen
1919
3. Open Vim
2020
4. To start a new CoVim server: `:CoVim start [port] [name]`
2121
5. To connect to a running server: `:CoVim connect [host address / 'localhost'] [port] [name]`

client.vim renamed to plugin/client.vim

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ import os
3232
from time import sleep
3333

3434

35-
CoVimServerPath = '~/.vim/plugin/server.py'
36-
35+
# Check for Vundle/Pathogen
36+
if os.path.exists(os.path.expanduser('~') + '/.vim/bundle/CoVim/plugin'):
37+
CoVimServerPath = '~/.vim/bundle/CoVim/plugin/server.py'
38+
else:
39+
CoVimServerPath = '~/.vim/plugin/server.py'
3740

3841
class VimProtocol(Protocol):
3942
def __init__(self, fact):
@@ -288,4 +291,4 @@ class CoVimScope:
288291
CoVim = CoVimScope()
289292
EOF
290293

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

0 commit comments

Comments
 (0)