Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of git://github.com/threeve/cocoa.vim

Conflicts:
	after/syntax/objc_enhanced.vim
	autoload/objc/cocoacomplete.vim
	autoload/objc/man.vim
	lib/get_methods.sh
  • Loading branch information...
commit 9a8b46b1e35166145f8ccc9b6b0824005bcd3744 2 parents 714cdcf + d7dc61b
@msanders authored
View
2  after/syntax/objc_enhanced.vim
@@ -9,7 +9,7 @@
" for you, just comment out the next line.
ru after/syntax/cocoa_keywords.vim
-syn match objcDirective '@synthesize\|@property' display
+syn match objcDirective '@synthesize\|@property\|@optional\|@required' display
syn keyword objcType IBOutlet IBAction Method
syn keyword objcConstant YES NO TRUE FALSE
View
2  autoload/objc/cocoacomplete.vim
@@ -3,7 +3,7 @@
" Last Updated: June 30, 2009
" Description: An omni-completion plugin for Cocoa/Objective-C.
-let s:lib_dir = fnameescape($HOME.'/.vim/lib/')
+let s:lib_dir = fnameescape(expand('<sfile>:p:h:h:h').'/lib/')
let s:cocoa_indexes = s:lib_dir.'cocoa_indexes/'
if !isdirectory(s:cocoa_indexes)
View
5 lib/get_methods.sh
@@ -1,3 +1,4 @@
-classes=`grep -m 1 ^$1 ~/.vim/lib/cocoa_indexes/classes.txt`
+dir=`dirname $0`
+classes=`grep -m 1 ^$1 ${dir}/cocoa_indexes/classes.txt`
if [ -z "$classes" ]; then exit; fi
-zgrep "^\($classes\)" ~/.vim/lib/cocoa_indexes/methods.txt.gz | sed 's/^[^ ]* //'
+zgrep "^\($classes\)" ${dir}/cocoa_indexes/methods.txt.gz | sed 's/^[^ ]* //'
Please sign in to comment.
Something went wrong with that request. Please try again.