From 41c40bc7b76a4ae8333164742733cf448979f658 Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Sun, 8 Apr 2018 11:14:49 +0200
Subject: [PATCH 1/3] add debug logging when starting session

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 pythonx/vdebug/session.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pythonx/vdebug/session.py b/pythonx/vdebug/session.py
index 5d3c161f..3b799305 100644
--- a/pythonx/vdebug/session.py
+++ b/pythonx/vdebug/session.py
@@ -112,10 +112,13 @@ def start_if_ready(self):
                   self.__ex_handler.exception_to_string(e))
 
     def __new_session(self):
+        log.Log("create session", log.Logger.DEBUG)
         self.__session = Session(self.__ui, self.__breakpoints,
                                  util.Keymapper())
 
+        log.Log("start session", log.Logger.DEBUG)
         status = self.__session.start(self.listener.create_connection())
+        log.Log("refresh event", log.Logger.DEBUG)
         self.dispatch_event("refresh", status)
 
 

From 076121c1d764169c5aeeb58b8344d863108b002b Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Sun, 8 Apr 2018 11:15:36 +0200
Subject: [PATCH 2/3] add debug logging to Keymapper

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 pythonx/vdebug/util.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pythonx/vdebug/util.py b/pythonx/vdebug/util.py
index 7dac94eb..be78d865 100644
--- a/pythonx/vdebug/util.py
+++ b/pythonx/vdebug/util.py
@@ -124,6 +124,7 @@ def close_key(self):
         return self.keymaps['close']
 
     def map(self):
+        log.Log("keymapper: map", log.Logger.DEBUG)
         if self.is_mapped:
             return
         self._store_old_map()
@@ -137,14 +138,17 @@ def map(self):
         self.is_mapped = True
 
     def reload(self):
+        log.Log("keymapper: reload", log.Logger.DEBUG)
         self.is_mapped = False
         self.map()
 
     def _reload_keys(self):
+        log.Log("keymapper: reload_keys", log.Logger.DEBUG)
         self.keymaps = vim.eval("g:vdebug_keymap")
         self.leader = vim.eval("g:vdebug_leader_key")
 
     def _store_old_map(self):
+        log.Log("keymapper: store_old_map", log.Logger.DEBUG)
         vim.command('let tempfile=tempname()')
         tempfile = vim.eval("tempfile")
         vim.command('mkexrc! %s' % (tempfile))
@@ -154,6 +158,7 @@ def _store_old_map(self):
         special = {"<buffer>", "<silent>", "<special>", "<script>", "<expr>",
                    "<unique>"}
         for line in codecs.open(tempfile, 'r', 'cp1250'):
+            log.Log("keymapper: line '%s'" % line, log.Logger.DEBUG)
             line = line.encode('utf-8').decode('utf-8')
             if not regex.match(line):
                 continue
@@ -170,6 +175,7 @@ def _store_old_map(self):
         os.remove(tempfile)
 
     def unmap(self):
+        log.Log("keymapper: unmap", log.Logger.DEBUG)
         if self.is_mapped:
             self.is_mapped = False
 

From 061b1dc45e78d07cd78a4bd712bf1574903cf38e Mon Sep 17 00:00:00 2001
From: BlackEagle <ike.devolder@gmail.com>
Date: Sun, 8 Apr 2018 11:23:23 +0200
Subject: [PATCH 3/3] open the exrc tmp file with ignore errors

When trying to store and restore the keymapping, the encoding might
differ, initially we found that most of the time the mkexrc command
would store in cp1250 encoding. It seems that depending on the vimrc
that command uses another encoding. Now we just open de tmpfile and
ignore encoding errors.

fixes #330

Signed-off-by: BlackEagle <ike.devolder@gmail.com>
---
 pythonx/vdebug/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pythonx/vdebug/util.py b/pythonx/vdebug/util.py
index be78d865..6be4799e 100644
--- a/pythonx/vdebug/util.py
+++ b/pythonx/vdebug/util.py
@@ -157,7 +157,7 @@ def _store_old_map(self):
         keys = {v for k, v in self.keymaps.items() if k not in self.exclude}
         special = {"<buffer>", "<silent>", "<special>", "<script>", "<expr>",
                    "<unique>"}
-        for line in codecs.open(tempfile, 'r', 'cp1250'):
+        for line in codecs.open(tempfile, 'r', errors='ignore'):
             log.Log("keymapper: line '%s'" % line, log.Logger.DEBUG)
             line = line.encode('utf-8').decode('utf-8')
             if not regex.match(line):