From b9c5f51b770629f0809851f632829c68152987af Mon Sep 17 00:00:00 2001
From: Vahagn Khachatryan <vahagn.khachatryan@gmail.com>
Date: Fri, 31 Oct 2014 22:34:48 +0400
Subject: [PATCH] remove sourceing of cf5-opt.vim. I am going to replace it
 with local .vimrc

---
 vim/plugin/cf5-compiler.vim | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/vim/plugin/cf5-compiler.vim b/vim/plugin/cf5-compiler.vim
index 1e35626..e8a475a 100755
--- a/vim/plugin/cf5-compiler.vim
+++ b/vim/plugin/cf5-compiler.vim
@@ -1,12 +1,16 @@
+"
+"
 "	{{{1
-"	Functions to compile and link a single c/cpp file.
+"	Functions to compile and link a single c/cpp/java files.
 "
 "	let g:cf5output
 "		=0 - no output window opened.
 "		=1 - ouput window opened.
 "
-"if exists("g:loaded_vahagn_compiler") | finish | endif
-let g:loaded_vahagn_compiler = 1
+if exists('g:loaded_cf5_compiler')
+   finish
+endif
+let g:loaded_cf5_compiler = 1
 
 "
 " Make sure let-modeline.vim is loaded.
@@ -212,13 +216,6 @@ function! CF5Compile(run)
 	"
 	call s:initDefaults()
 	"
-	"	Source compile-opt.vim if exists.
-	"
-	verbose let l:copt=expand("%:p:h")."/cf5-opt.vim"
-	if filereadable(l:copt)
-		exec ":source ".l:copt
-	endif
-	"
 	"	Set source specific compiler options.
 	"
 	call FirstModeLine()