X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=pygdb.vim;h=7a8b89f45901be31ed691ac53b268cb84ef0022d;hb=127bb50e7d884d3a413ab4b3b429e89b5dfebf74;hp=ea552d307a0b130646770c4b4607a0de7527de64;hpb=ae13f1cd2401475e1fc58be3418fb349cd69fb98;p=pygdb.git

diff --git a/pygdb.vim b/pygdb.vim
index ea552d3..7a8b89f 100644
--- a/pygdb.vim
+++ b/pygdb.vim
@@ -28,7 +28,7 @@ clientcmd = ""
 execsign = None
 
 def gdbLaunch():
-	global gdbterm, mainctrlwnd, statuswnd, gdbBps, clientcmd, gdbthread
+	global gdbBps, clientcmd
 
 	clientcmd = vim.eval("input('Client commando: ', '%s')" % clientcmd).strip()
 
@@ -39,11 +39,12 @@ def gdbLaunch():
 	#Add the breakpoints to the configuration
 	conf = Configuration.Configuration()
 	conf.load(".pygdb.conf")
+	conf.breakpoints = []
 	for bp in gdbBps:
 		conf.addBreak(bp["file"], bp["lineno"], bp["cond"])
 	conf.store(".pygdb.conf")
 	
-	vim.command("!python %s/pygdb.py %s &\n" % (pygdbdir, clientcmd))
+	vim.command("!python %s/pygdb.py --vim-servername %s %s &\n" % (pygdbdir, vim.eval("v:servername"), clientcmd))
 
 
 def gdbToggleBreakpoint(lineno=None, file=None):
@@ -214,8 +215,6 @@ def gdbLoadConfig():
 	global clientcmd, gdbBps, cmdset
 
 
-
-
 	#Load configuration
 	conf = Configuration.Configuration()
 	conf.load(".pygdb.conf")
@@ -228,6 +227,10 @@ def gdbLoadConfig():
 	for bp in conf.breakpoints:
 		bp["file"] = toAbsPath( bp["file"] )
 		addBreakpoint(bp["file"], bp["lineno"], bp["cond"])
+
+	#Set the command from config
+	if conf.getCommand() != None:
+		clientcmd = conf.getCommand()
 	
 	#Set current execution line
 	if conf.isCurrposSet():
@@ -235,6 +238,7 @@ def gdbLoadConfig():
 		setExecutionLine(file, conf.currlineno)
 	else:
 		delExecutionLine()
+
 >>
 
 highlight ExecutionLine term=bold ctermbg=DarkGreen ctermfg=Black guibg=LightGreen guifg=Black