Skip to content

Update to 0.15 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update to 0.15 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions autoload/conque_gdb.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ function! conque_gdb#remove_prev_pointer()
catch
endtry

let s:sign_file = ''
let s:sign_file = ''
endif
endfunction

Expand Down Expand Up @@ -328,7 +328,8 @@ function! s:get_unix_gdb()
return ''
endif

sil let l:gdb_py_support = system(l:gdb_exe . ' -q -batch -ex "python print(\"PYYES\")"')
let pyresp = "'PYYES'"
sil let l:gdb_py_support = system(l:gdb_exe . ' -q -batch -ex "python print(' . pyresp . ')"')
if l:gdb_py_support =~ ".*PYYES\n.*"
" Gdb has python support
let g:conque_gdb_gdb_py_support = 1
Expand Down Expand Up @@ -430,12 +431,12 @@ function! conque_gdb#open(...)
let s:is_gdb_startup = 1
try
let s:gdb = conque_term#open(l:gdb_cmd, l:start_cmds, get(a:000, 2, 0), get(a:000, 3, 1), s:term_object)
sil exe 'file ConqueGDB\#' . s:gdb.idx
sil exe 'file ConqueGDB\#' . s:gdb.idx
catch
endtry
let s:is_gdb_startup = 0
endif
let s:src_bufwin = winnr("#")
let s:src_bufwin = winnr("#")
endfunction

" Send a command to the gdb subprocess.
Expand Down Expand Up @@ -478,7 +479,7 @@ function! conque_gdb#command(cmd)

if l:go_back
sil noautocmd wincmd p
sil exe 'noautocmd ' . l:win . 'wincmd w'
sil exe 'noautocmd ' . l:win . 'wincmd w'
endif
endfunction

Expand All @@ -494,7 +495,7 @@ endfunction
" Note that this is only supported on Unix where gdb has support for the
" python API.
function! conque_gdb#toggle_breakpoint(fullfile, line)
let l:command = "clear "
let l:command = "clear "
if bufloaded(s:gdb.buffer_number) || s:gdb.active
sil exe s:py . ' ' . s:gdb.var . '.vim_toggle_breakpoint("' . s:escape_to_py_file(a:fullfile) .'","'. a:line .'")'
endif
Expand Down
4 changes: 2 additions & 2 deletions autoload/conque_term/conque.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,8 +1090,8 @@ def abort(self):

def poll_wait_for_proc(self, tries):
""" Try 'tries' times to see if self.proc has become a zombie
such that we can reclaim its resources. Wait for 2ms before each try.
"""
such that we can reclaim its resources. Wait for 2ms before each try.
"""
pid = self.proc.getpid()
try:
for i in range(tries):
Expand Down