Merge BlackIkeEagle's function name changes, see #158

Also rename two other functions prefixed with "vdebug:".

Author: joonty

README.md

@@ -26,6 +26,8 @@ If you're having trouble with Vdebug in any way, here are the steps you can take
 
 # News
 
+Follow me on Twitter, [@joonty](http://twitter.com/joonty), for Vdebug updates and release news.
+
 **19/07/2013:** there's a known issue with Vdebug and Vim 7.4. Take a look at [issue #98][5] to follow updates and fixes.
 
 **11/06/2013:** Vdebug now has an irc channel on freenode! If you're running into problems installing, configuring or running vdebug, or you just want to ask a general question, join us on **#vdebug**.
@@ -78,7 +80,7 @@ where the path supplied is vdebug's doc directory. This should enable vdebug's h
 
 **Requirements**:
 
-  * Vim compiled with Python 2.6+ support, tabs and signs
+  * Vim compiled with Python 2.6+ support, tabs and signs (for Debian/Ubuntu this is provided in the vim-nox package)
   * A programming language that has a DBGP debugger, e.g. PHP, Python, Ruby,
     Perl, NodeJS, Tcl...
 

doc/Vdebug.txt

@@ -719,7 +719,7 @@ You can evaluate code snippets at the current point of execution, which can be
 used to see the result of a condition, arithmetic expressions, etc. These
 snippets are written in the language that's being debugged. There are two ways
 of evaluating expresions: you can either write them yourself
-(|VdebugEvalExpression) or use visual highlighting to select an expression from
+(|VdebugEvalExpression|) or use visual highlighting to select an expression from
 the source window.
 
 On evaluating an expression, the result is shown in the watch window. To return

plugin/python/vdebug/event.py

@@ -60,7 +60,7 @@ class VisualEvalEvent(Event):
     """Evaluate a block of code given by visual selection in Vim.
     """
     def execute(self,runner):
-        selection = vim.eval("vdebug:get_visual_selection()")
+        selection = vim.eval("Vdebug_get_visual_selection()")
         runner.eval(selection)
         return True
 

plugin/python/vdebug/ui/vimui.py

@@ -42,7 +42,7 @@ def open(self):
             vim.command('silent tabnew')
             self.empty_buf_num = vim.eval('bufnr("%")')
             if existing_buffer:
-                vim.command('call vdebug:edit("%s")' % cur_buf_name)
+                vim.command('call Vdebug_edit("%s")' % cur_buf_name)
 
             self.tabnr = vim.eval("tabpagenr()")
 
@@ -230,7 +230,7 @@ def set_file(self,file):
         self.file = file
         vdebug.log.Log("Setting source file: "+file,vdebug.log.Logger.INFO)
         self.focus()
-        vim.command('call vdebug:edit("%s")' % str(file).replace("\\", "\\\\"))
+        vim.command('call Vdebug_edit("%s")' % str(file).replace("\\", "\\\\"))
 
     def set_line(self,lineno):
         self.focus()

plugin/python/vdebug/util.py

@@ -4,6 +4,7 @@
 import re
 import os
 import urllib
+import time
 
 class Keymapper:
     """Map and unmap key commands for the Vim user interface.
@@ -202,6 +203,7 @@ class InputStream:
     def probe(self):
         try:
             vim.eval("getchar(0)")
+            time.sleep(0.1)
         except: # vim.error
             raise UserInterrupt()
 

plugin/vdebug.vim

@@ -112,6 +112,7 @@ python debugger = DebuggerInterface()
 
 " Commands
 command! -nargs=? -complete=customlist,s:BreakpointTypes Breakpoint python debugger.set_breakpoint(<q-args>)
+command! VdebugStart python debugger.run()
 command! -nargs=? BreakpointRemove python debugger.remove_breakpoint(<q-args>)
 command! BreakpointWindow python debugger.toggle_breakpoint_window()
 command! -nargs=? VdebugEval python debugger.handle_eval(<q-args>)
@@ -140,7 +141,7 @@ endfunction
 "
 " This should be called if you want to update the options after vdebug has
 " been loaded.
-function! vdebug:load_options(options)
+function! Vdebug_load_options(options)
     " Merge options with defaults
     let g:vdebug_options = extend(g:vdebug_options_defaults, a:options)
 endfunction
@@ -149,7 +150,7 @@ endfunction
 "
 " This should be called if you want to update the keymappings after vdebug has
 " been loaded.
-function! vdebug:load_keymaps(keymaps)
+function! Vdebug_load_keymaps(keymaps)
     " Unmap existing keys, if applicable
     if has_key(g:vdebug_keymap, "run")
         exe "silent! nunmap ".g:vdebug_keymap["run"]
@@ -187,7 +188,7 @@ function! s:OptionNames(A,L,P)
     endif
 endfunction
 
-function! vdebug:get_visual_selection()
+function! Vdebug_get_visual_selection()
   let [lnum1, col1] = getpos("'<")[1:2]
   let [lnum2, col2] = getpos("'>")[1:2]
   let lines = getline(lnum1, lnum2)
@@ -196,7 +197,7 @@ function! vdebug:get_visual_selection()
   return join(lines, "\n")
 endfunction
 
-function! vdebug:edit(filename)
+function! Vdebug_edit(filename)
     try
         execute 'buffer' fnameescape(a:filename)
     catch /^Vim\%((\a\+)\)\=:E94/
@@ -205,5 +206,5 @@ function! vdebug:edit(filename)
 endfunction
 
 silent doautocmd User VdebugPost
-call vdebug:load_options(g:vdebug_options)
-call vdebug:load_keymaps(g:vdebug_keymap)
+call Vdebug_load_options(g:vdebug_options)
+call Vdebug_load_keymaps(g:vdebug_keymap)