Version 0.11

* Resolved problem with moving cursor to wrong window when break points were hit. (This could happen when a taglist window was open while debugging).

Author: andreaslyn

autoload/conque_gdb.vim

@@ -82,7 +82,7 @@ function! s:escape_to_py_file(fname)
     return l:fname
 endfunction
 
-" Heuristic attempt to escape file names before opening them for edit/view
+" Attempt to escape file names before opening them for edit/view
 function! s:escape_to_shell_file(fname)
     if s:platform != 'win'
         let l:fname = substitute(a:fname, '\\', '\\\\', 'g')
@@ -283,6 +283,8 @@ function! conque_gdb#breakpoint(fname, lineno)
     let l:fname = s:escape_to_shell_file(l:fname_py)
 
     if l:perm != ''
+        let l:last_win = winnr()
+        let l:last_buf = bufnr("%")
         call s:open_file(l:fname, l:lineno, l:perm)
 
         sil exe 'noautocmd ' . s:src_bufwin . 'wincmd w'
@@ -293,6 +295,15 @@ function! conque_gdb#breakpoint(fname, lineno)
         call s:buf_update()
 
         sil exe 'noautocmd wincmd p'
+        if bufnr("%") != l:last_buf
+            if l:last_buf != winbufnr(l:last_win)
+                let l:last = bufwinnr(l:last_buf)
+                if l:last != -1
+                    let l:last_win = l:last
+                endif
+            endif
+            sil exe 'noautocmd ' . l:last_win . ' wincmd w'
+        endif
     else
         " Gdb should detect that the file can't be opened. This should not happen.
         echohl WarningMsg | echomsg 'ConqueGdb: Unable to open file ' . a:fname | echohl None

autoload/conque_gdb/conque_gdb.py

@@ -103,7 +103,7 @@ class ConqueGdb(Conque):
     registered_breakpoints = RegisteredBpDict()
 
     # Mapping from linenumber + filename to a tuple containing the id of the sign 
-    # placed there and whether the breakpoint is enebled ('y') or disabled ('n')
+    # placed there and whether the breakpoint is enabled ('y') or disabled ('n')
     lookup_sign_ids = dict()
 
     # Id number of the next sign to place. Start from 15607 FTW!

doc/conque_gdb.txt

@@ -7,7 +7,7 @@ This help file explains the Conque GDB Vim plugin.
 Introduction
 
 The Conque GDB plugin extends the Conque (Conque Term) plugin. Like Conque
-Term Conque GDB is a terminal emulator. The |ConqueGdb|, |ConqueGdbSplit|,
+Term, Conque GDB is a terminal emulator. The |ConqueGdb|, |ConqueGdbSplit|,
 |ConqueGdbVsplit| and |ConqueGdbTab| commands will turn a Vim buffer into a
 GDB command line interface (CLI).
 
@@ -211,13 +211,13 @@ keyboard mappings to work properly. See the help file |conque_term.txt|.
                                              *g:ConqueGdb_Leader*
 
 This option specifies which keyboard key is used as prefix for the Conque GDB
-keyboard mappings described below. You can specify this to anything you want,
-however you can freely modify any of the keyboard mapping regardless of the
-value of |g:ConqueGdb_Leader|. By default it is:
+keyboard mappings described below. By default it is:
 >
     let g:ConqueGdb_Leader = '<Leader>'
 >
-Note that |<Leader>| is usually defined as \ (backslash).
+Note that |<Leader>| is usually defined as \ (backslash). You don't have to
+use the |g:ConqueGdb_Leader| when defining new keyboard mappings as described
+below.
 
 3.4.2 Run program mapping                    *conque-gdb-run-mapping*
                                              *g:ConqueGdb_Run*