Merge branch 'option-reload' into dev

Conflicts:
	plugin/vdebug.vim

Author: joonty

plugin/python/vdebug/runner.py

@@ -34,7 +34,7 @@ def open(self):
                 self.ui.error("Modified buffers must be saved before debugging")
                 return
             vdebug.opts.Options.set(vim.eval('g:vdebug_options'))
-            
+
             if vdebug.opts.Options.isset('debug_file'):
                 vdebug.log.Log.set_logger(vdebug.log.FileLogger(\
                         vdebug.opts.Options.get('debug_file_level'),\

plugin/python/vdebug/util.py

@@ -12,8 +12,7 @@ class Keymapper:
     exclude = ["run","set_breakpoint","eval_visual"]
 
     def __init__(self):
-        self.keymaps = vim.eval("g:vdebug_keymap")
-        self.leader = vim.eval("g:vdebug_leader_key")
+        self._reload_keys()
         self.is_mapped = False
         self.existing = []
 
@@ -27,6 +26,7 @@ def map(self):
         if self.is_mapped:
             return
         self._store_old_map()
+        self._reload_keys()
         for func in self.keymaps:
             if func not in self.exclude:
                 key = self.keymaps[func]
@@ -35,6 +35,10 @@ def map(self):
                 vim.command(map_cmd)
         self.is_mapped = True
 
+    def _reload_keys(self):
+        self.keymaps = vim.eval("g:vdebug_keymap")
+        self.leader = vim.eval("g:vdebug_leader_key")
+
     def _store_old_map(self):
         vim.command('let tempfile=tempname()')
         tempfile = vim.eval("tempfile")

plugin/vdebug.vim

@@ -64,6 +64,10 @@ if !exists("g:vdebug_features")
     let g:vdebug_features = {}
 endif
 
+if !exists("g:vdebug_leader_key")
+    let g:vdebug_leader_key = ""
+endif
+
 let g:vdebug_keymap_defaults = {
 \    "run" : "<F5>",
 \    "run_to_cursor" : "<F9>",
@@ -103,20 +107,9 @@ if g:vdebug_force_ascii == 1
     let g:vdebug_options_defaults["marker_open_tree"] = '-'
 endif
 
-let g:vdebug_options = extend(g:vdebug_options_defaults,g:vdebug_options)
-let g:vdebug_keymap = extend(g:vdebug_keymap_defaults,g:vdebug_keymap)
-let g:vdebug_leader_key = ""
-
 " Create the top dog
 python debugger = DebuggerInterface()
 
-" Mappings allowed in non-debug mode
-exe "noremap ".g:vdebug_keymap["run"]." :python debugger.run()<cr>"
-exe "noremap ".g:vdebug_keymap["set_breakpoint"]." :python debugger.set_breakpoint()<cr>"
-
-" Exceptional case for visual evaluation
-exe "vnoremap ".g:vdebug_keymap["eval_visual"]." :python debugger.handle_visual_eval()<cr>"
-
 " Commands
 command! -nargs=? -complete=customlist,s:BreakpointTypes Breakpoint python debugger.set_breakpoint(<q-args>)
 command! -nargs=? BreakpointRemove python debugger.remove_breakpoint(<q-args>)
@@ -127,6 +120,7 @@ command! -nargs=+ -complete=customlist,s:OptionNames VdebugOpt python debugger.h
 " Signs and highlighted lines for breakpoints, etc.
 sign define current text=-> texthl=DbgCurrentSign linehl=DbgCurrentLine
 sign define breakpt text=B> texthl=DbgBreakptSign linehl=DbgBreakptLine
+
 hi default DbgCurrentLine term=reverse ctermfg=White ctermbg=Red guifg=#ffffff guibg=#ff0000
 hi default DbgCurrentSign term=reverse ctermfg=White ctermbg=Red guifg=#ffffff guibg=#ff0000
 hi default DbgBreakptLine term=reverse ctermfg=White ctermbg=Green guifg=#ffffff guibg=#00ff00
@@ -142,6 +136,42 @@ function! s:BreakpointTypes(A,L,P)
     endif
 endfunction
 
+" Reload options dictionary, by merging with default options.
+"
+" This should be called if you want to update the options after vdebug has
+" been loaded.
+function! vdebug:load_options(options)
+    " Merge options with defaults
+    let g:vdebug_options = extend(g:vdebug_options_defaults, a:options)
+endfunction
+
+" Assign keymappings, and merge with defaults.
+"
+" This should be called if you want to update the keymappings after vdebug has
+" been loaded.
+function! vdebug:load_keymaps(keymaps)
+    " Unmap existing keys, if applicable
+    if has_key(g:vdebug_keymap, "run")
+        exe "silent! nunmap ".g:vdebug_keymap["run"]
+    endif
+    if has_key(g:vdebug_keymap, "set_breakpoint")
+        exe "silent! nunmap ".g:vdebug_keymap["set_breakpoint"]
+    endif
+    if has_key(g:vdebug_keymap, "eval_visual")
+        exe "silent! vunmap ".g:vdebug_keymap["eval_visual"]
+    endif
+
+    " Merge keymaps with defaults
+    let g:vdebug_keymap = extend(g:vdebug_keymap_defaults, a:keymaps)
+
+    " Mappings allowed in non-debug mode
+    exe "noremap ".g:vdebug_keymap["run"]." :python debugger.run()<cr>"
+    exe "noremap ".g:vdebug_keymap["set_breakpoint"]." :python debugger.set_breakpoint()<cr>"
+
+    " Exceptional case for visual evaluation
+    exe "vnoremap ".g:vdebug_keymap["eval_visual"]." :python debugger.handle_visual_eval()<cr>"
+endfunction
+
 function! s:OptionNames(A,L,P)
     let arg_to_cursor = strpart(a:L,10,a:P)
     let space_idx = stridx(arg_to_cursor,' ')
@@ -175,3 +205,5 @@ function! vdebug:edit(filename)
 endfunction
 
 silent doautocmd User VdebugPost
+call vdebug:load_options(g:vdebug_options)
+call vdebug:load_keymaps(g:vdebug_keymap)