Merge branch 'experimental' of git://github.com/mason-larobina/uzbl into experimental

5 files changed, 16 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 44d21bd..026deeb 100644
--- a/Makefile
+++ b/Makefile
@@ -63,8 +63,8 @@ test-dev: uzbl-core
 	XDG_DATA_HOME=./examples/data                    XDG_CONFIG_HOME=./examples/config                                        ./uzbl-core --uri http://www.uzbl.org --verbose
 
 test-dev-browser: uzbl-browser
-	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/uzbl-cookie-daemon start -nv &
-	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/uzbl-event-manager start -nv &
+	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/uzbl-cookie-daemon restart -nv &
+	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/uzbl-event-manager restart -nav &
 	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:`pwd`/examples/data/uzbl/scripts/:$$PATH" ./uzbl-browser --uri http://www.uzbl.org --verbose
 	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/uzbl-cookie-daemon stop -v
 	XDG_DATA_HOME=./examples/data   XDG_CACHE_HOME=./examples/cache   XDG_CONFIG_HOME=./examples/config   PATH="`pwd`:$$PATH" ./examples/data/uzbl/scripts/uzbl-event-manager stop -v
diff --git a/examples/data/uzbl/plugins/bind.py b/examples/data/uzbl/plugins/bind.py
index 3e47e38..10cce6a 100644
--- a/examples/data/uzbl/plugins/bind.py
+++ b/examples/data/uzbl/plugins/bind.py
@@ -27,6 +27,10 @@ find_prompts = re.compile('<([^:>]*):(\"[^\"]*\"|\'[^\']*\'|[^>]*)>').split
 ON_EXEC, HAS_ARGS, MOD_CMD, GLOB, MORE = range(5)
 
 
+class ArgumentError(Exception):
+    pass
+
+
 def ismodbind(glob):
     '''Return True if the glob specifies a modbind.'''
 
@@ -291,8 +295,9 @@ def clear_stack(uzbl):
     bind_dict['depth'] = 0
     bind_dict['args'] = []
     if bind_dict['last_mode']:
-        uzbl.set_mode(bind_dict['last_mode'])
+        mode = bind_dict['last_mode']
         bind_dict['last_mode'] = ''
+        uzbl.set_mode(mode)
 
     uzbl.set('keycmd_prompt')
 
diff --git a/examples/data/uzbl/plugins/completion.py b/examples/data/uzbl/plugins/completion.py
index 42e7e17..770f310 100644
--- a/examples/data/uzbl/plugins/completion.py
+++ b/examples/data/uzbl/plugins/completion.py
@@ -194,5 +194,5 @@ def init(uzbl):
     # And connect the dicts event handlers to the handler stack.
     uzbl.connect_dict(connects)
 
-    for event in ['STOP_COMPLETION', 'KEYCMD_EXEC', 'KEYCMD_CLEAR']:
+    for event in ['STOP_COMPLETION', 'KEYCMD_EXEC', 'KEYCMD_CLEARED']:
         uzbl.connect(event, stop_completion)
diff --git a/examples/data/uzbl/plugins/keycmd.py b/examples/data/uzbl/plugins/keycmd.py
index fd17363..0f5bb9b 100644
--- a/examples/data/uzbl/plugins/keycmd.py
+++ b/examples/data/uzbl/plugins/keycmd.py
@@ -257,7 +257,7 @@ def clear_keycmd(uzbl):
     k.cursor = 0
     k._repr_cache = False
     uzbl.set('keycmd')
-    uzbl.event('KEYCMD_CLEAR')
+    uzbl.event('KEYCMD_CLEARED')
 
 
 def clear_modcmd(uzbl, clear_held=False):
@@ -271,7 +271,7 @@ def clear_modcmd(uzbl, clear_held=False):
         k.held = set()
 
     uzbl.set('modcmd')
-    uzbl.event('MODCMD_CLEAR')
+    uzbl.event('MODCMD_CLEARED')
 
 
 def clear_current(uzbl):
diff --git a/examples/data/uzbl/plugins/mode.py b/examples/data/uzbl/plugins/mode.py
index 2b2579a..f85d999 100644
--- a/examples/data/uzbl/plugins/mode.py
+++ b/examples/data/uzbl/plugins/mode.py
@@ -58,7 +58,8 @@ def get_mode(uzbl):
 def mode_changed(uzbl, mode):
     '''The mode has just been changed, now set the per-mode config.'''
 
-    get_mode_dict(uzbl)['mode'] = mode
+    if get_mode(uzbl) != mode:
+        return
 
     config = uzbl.get_config()
     mode_config = get_mode_config(uzbl, mode)
@@ -92,12 +93,10 @@ def set_mode(uzbl, mode=None):
 
     if 'mode' not in config or config['mode'] != mode:
         config['mode'] = mode
-        return
-
-    elif get_mode(uzbl) == mode:
-        return
 
-    uzbl.event("MODE_CHANGED", mode)
+    elif mode_dict['mode'] != mode:
+        mode_dict['mode'] = mode
+        uzbl.event("MODE_CHANGED", mode)
 
 
 def config_changed(uzbl, key, value):