Version 0.4

* Bug fixes
* New keyboard mappings

Author: andreaslyn

autoload/conque_gdb.vim

@@ -392,17 +392,17 @@ function! conque_gdb#open(...)
             return
         endif
 
-        if g:conque_gdb_gdb_py_support
-            let l:extra = ' '
+        "if g:conque_gdb_gdb_py_support
+        "    let l:extra = ' '
+        "else
+        " Find out which gdb command script gdb should execute on startup.
+        sil let l:enable_confirm = system(s:gdb_command . ' -q -batch -ex "show confirm"')
+        if l:enable_confirm =~ '.*\s\+[Oo][Nn]\W.*'
+            let l:extra = ' -x ' . s:SCRIPT_DIR . 'gdbinit_confirm.gdb '
         else
-            " Find out which gdb command script gdb should execute on startup.
-            sil let l:enable_confirm = system(s:gdb_command . ' -q -batch -ex "show confirm"')
-            if l:enable_confirm =~ '.*\s\+[Oo][Nn]\W.*'
-                let l:extra = ' -x ' . s:SCRIPT_DIR . 'nopyc.gdb '
-            else
-                let l:extra = ' -x ' . s:SCRIPT_DIR . 'nopync.gdb '
-            endif
+            let l:extra = ' -x ' . s:SCRIPT_DIR . 'gdbinit_no_confirm.gdb '
         endif
+        "endif
 
         " Don't let user use the TUI feature. It does not work with ConqueGdb.
         let l:user_args = get(a:000, 0, '')

autoload/conque_gdb/conque_gdb.py

@@ -9,13 +9,12 @@
 # Marks a prompt has started and stopped
 GDB_PROMPT_MARK = '\x1a\x18'
 
-GDB_BREAK_REGEX = re.compile(GDB_BREAK_MARK)
+GDB_BREAK_REGEX = re.compile('.*' + GDB_BREAK_MARK + '.*')
 
-GDB_EXIT_REGEX = re.compile(GDB_EXIT_MARK)
+GDB_EXIT_REGEX = re.compile('.*' + GDB_EXIT_MARK + '.*')
 
 GDB_PROMPT_REGEX = re.compile('.*' + GDB_PROMPT_MARK + '.*')
 
-#GET_BPS_REGEX = re.compile('(bkpt\s*?\=\s*?\{.*?(?:["].*?["])+?\s*?\}.*?)', re.I)
 GET_BPS_REGEX = re.compile('(bkpt\s*?\=\s*?\{.*?(?:["].*?["])+?\s*?\}(?!\s*?,\s*?\{).*?)', re.I)
 
 GET_ATTR_STR = '\s*?\=\s*?["](.*?)["].*?'
@@ -118,10 +117,10 @@ def plain_text(self, input):
             self.append_breakpoint(input)
         elif GDB_BREAK_REGEX.match(input):
             self.begin_breakpoint()
-            self.plain_text(input.replace(GDB_BREAK_MARK, ''))
+            self.plain_text(input.split(GDB_BREAK_MARK, 1)[1])
         elif GDB_EXIT_REGEX.match(input):
             self.handle_inferior_exit()
-            self.plain_text(input.replace(GDB_EXIT_MARK, ''))
+            self.plain_text(input.split(GDB_EXIT_MARK, 1)[1])
         elif GDB_PROMPT_REGEX.match(input):
             sp = input.split(GDB_PROMPT_MARK)
             if sp[0] != '':

autoload/conque_gdb/nopyc.gdb renamed to autoload/conque_gdb/gdbinit_confirm.gdb

@@ -2,7 +2,7 @@ set confirm off
 
 set prompt (gdb) 
 define set prompt
-  echo set prompt is not supported with ConqueGdb when GDB doesn't have python support\n
+  echo set prompt is not supported by ConqueGdb\n
 end
 
 define set annotate
@@ -17,4 +17,8 @@ define tui
   echo tui command is not supported by ConqueGdb\n
 end
 
+define refresh
+  echo refresh command is not supported by ConqueGdb\n
+end
+
 set confirm on

autoload/conque_gdb/nopync.gdb renamed to autoload/conque_gdb/gdbinit_no_confirm.gdb

@@ -1,6 +1,6 @@
 set prompt (gdb) 
 define set prompt
-  echo set prompt is not supported with ConqueGdb when GDB doesn't have python support\n
+  echo set prompt is not supported by ConqueGdb\n
 end
 
 define set annotate
@@ -14,3 +14,7 @@ end
 define tui
   echo tui command is not supported by ConqueGdb\n
 end
+
+define refresh
+  echo refresh command is not supported by ConqueGdb\n
+end

doc/conque_gdb.txt

@@ -51,6 +51,9 @@ Contents
        3.5.7 Toggle break point mapping      |conque-gdb-toggle-mapping|
        3.5.8 Set break point mapping         |conque-gdb-break-mapping|
        3.5.9 Delete break point mapping      |conque-gdb-delete-break-mapping|
+       3.5.10 Finish mapping                 |conque-gdb-finish-mapping|
+       3.5.11 Backtrace mapping              |conque-gdb-backtrace-mapping|
+4. Custom key mappings                       |conque-gdb-custom-key-mappings|
 
 ==============================================================================
 
@@ -212,9 +215,9 @@ 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:
 >
-    let g:ConqueGdb_Leader = '<leader>'
+    let g:ConqueGdb_Leader = '<Leader>'
 >
-Note that |<leader>| is usually defined as \ (backslash).
+Note that |<Leader>| is usually defined as \ (backslash).
 
 3.4.2 Run program mapping                    *conque-gdb-run-mapping*
                                              *g:ConqueGdb_Run*
@@ -289,6 +292,36 @@ line. Default:
 >
     let g:ConqueGdb_DeleteBreak = g:ConqueGdb_Leader . 'd'
 >
+3.5.10 Finish mapping                              *conque-gdb-finish-mapping*
+                                                   *g:ConqueGdb_Finish*
+
+Mapping to issue the finish command. Default:
+>
+    let g:ConqueGdb_Finish = g:ConqueGdb_Leader . 'f'
+>
+3.5.11 Backtrace mapping                        *conque-gdb-backtrace-mapping*
+                                                *g:ConqueGdb_Backtrace*
+
+Mapping to execute the backtrace command. By default it is:
+>
+    let g:ConqueGdb_Backtrace = g:ConqueGdb_Leader . 't'
+>
+4. Custom key mappings                        *conque-gdb-custom-key-mappings*
+
+This section shows you how you can use |ConqueGdbCommand| to setup your
+own customized Conque GDB key mappings.
+
+You might want to be able answer GDB confirmations (say y or n) without
+having to go to the Conque GDB window. You can use the |ConqueGdbCommand|
+command to achieve this:
+>
+    nnoremap <silent> <Leader>Y :ConqueGdbCommand y<CR>
+    nnoremap <silent> <Leader>N :ConqueGdbCommand n<CR>
+>
+With those 2 lines in your vimrc file you can type the leader key followed
+by a capital Y to answer yes to GDB confirmations and leader followed by
+capital N to answer no to GDB confirmations.
+
 ==============================================================================
 
 vim:tw=78:ts=8:ft=help:norl:

plugin/conque_gdb.vim

@@ -66,6 +66,12 @@ endif
 if !exists('g:ConqueGdb_Print')
     let g:ConqueGdb_Print = g:ConqueGdb_Leader . 'p'
 endif
+if !exists('g:ConqueGdb_Finish')
+    let g:ConqueGdb_Finish = g:ConqueGdb_Leader . 'f'
+endif
+if !exists('g:ConqueGdb_Backtrace')
+    let g:ConqueGdb_Backtrace = g:ConqueGdb_Leader . 't'
+endif
 
 " Commands to open conque gdb
 command! -nargs=* -complete=file ConqueGdb call conque_gdb#open(<q-args>, [
@@ -98,4 +104,6 @@ exe 'nnoremap <silent> ' . g:ConqueGdb_Continue . ' :call conque_gdb#command("co
 exe 'nnoremap <silent> ' . g:ConqueGdb_Run . ' :call conque_gdb#command("run")<CR>'
 exe 'nnoremap <silent> ' . g:ConqueGdb_Next . ' :call conque_gdb#command("next")<CR>'
 exe 'nnoremap <silent> ' . g:ConqueGdb_Step . ' :call conque_gdb#command("step")<CR>'
+exe 'nnoremap <silent> ' . g:ConqueGdb_Finish . ' :call conque_gdb#command("finish")<CR>'
+exe 'nnoremap <silent> ' . g:ConqueGdb_Backtrace . ' :call conque_gdb#command("backtrace")<CR>'
 exe 'nnoremap <silent> ' . g:ConqueGdb_Print . ' :call conque_gdb#print_word(expand("<cword>"))<CR>'