merge in changes from master

1 files changed, 18 insertions, 12 deletions

diff --git a/examples/data/uzbl/plugins/bind.py b/examples/data/uzbl/plugins/bind.py
index 9614df6..9e09337 100644
--- a/examples/data/uzbl/plugins/bind.py
+++ b/examples/data/uzbl/plugins/bind.py
@@ -13,9 +13,6 @@ import sys
 import re
 import pprint
 
-# Export these functions to uzbl.<name>
-__export__ = ['bind', 'mode_bind', 'get_bindlet']
-
 # Hold the bind dicts for each uzbl instance.
 UZBLS = {}
 
@@ -504,12 +501,21 @@ def modcmd_exec(uzbl, keylet):
 
 
 def init(uzbl):
-    connects = {'BIND': parse_bind,
-      'MODE_BIND': parse_mode_bind,
-      'KEYCMD_UPDATE': keycmd_update,
-      'MODCMD_UPDATE': modcmd_update,
-      'KEYCMD_EXEC': keycmd_exec,
-      'MODCMD_EXEC': modcmd_exec,
-      'MODE_CHANGED': mode_changed}
-
-    uzbl.connect_dict(connects)
+    # Event handling hooks.
+    uzbl.connect_dict({
+        'BIND':             parse_bind,
+        'KEYCMD_EXEC':      keycmd_exec,
+        'KEYCMD_UPDATE':    keycmd_update,
+        'MODCMD_EXEC':      modcmd_exec,
+        'MODCMD_UPDATE':    modcmd_update,
+        'MODE_BIND':        parse_mode_bind,
+        'MODE_CHANGED':     mode_changed,
+    })
+
+    # Function exports to the uzbl object, `function(uzbl, *args, ..)`
+    # becomes `uzbl.function(*args, ..)`.
+    uzbl.export_dict({
+        'bind':         bind,
+        'mode_bind':    mode_bind,
+        'get_bindlet':  get_bindlet,
+    })