diff options
author | Mason Larobina <mason.larobina@gmail.com> | 2010-01-27 10:44:49 +0800 |
---|---|---|
committer | Mason Larobina <mason.larobina@gmail.com> | 2010-01-27 10:44:49 +0800 |
commit | 4696ba94727f416bb62fc6a12f4d4b2ee1dc8a91 (patch) | |
tree | 64e56d8a6276b8ea32236a2d92905f9ef9137e77 | |
parent | aa582afe85289835e2471f0f19962f7471af28cd (diff) | |
parent | a1f343c7c57fcee1aaf22ad446198cc082c45768 (diff) |
Merge branch 'master' into experimental
Conflicts:
examples/config/config
-rw-r--r-- | examples/config/config | 2 | ||||
-rwxr-xr-x | misc/env.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/config/config b/examples/config/config index 3730960..b30ff45 100644 --- a/examples/config/config +++ b/examples/config/config @@ -314,7 +314,7 @@ set follow_hint_keys = 0123456789 #set follow_hint_keys = qwerty #set follow_hint_keys = asdfghjkl; #set follow_hint_keys = thsnd-rcgmvwb/;789aefijkopquxyz234 -@cbind f* = script @scripts_dir/follow.js '@{follow_hint_keys} %s' +@cbind fl* = script @scripts_dir/follow.js '%s @{follow_hint_keys}' # --- Form filler binds --- # this script allows you to configure (per domain) values to fill in form diff --git a/misc/env.sh b/misc/env.sh index 4eec525..0dfedfa 100755 --- a/misc/env.sh +++ b/misc/env.sh @@ -19,5 +19,5 @@ export XDG_DATA_HOME=$HOME/.local/share export XDG_CACHE_HOME=$HOME/.cache export XDG_CONFIG_HOME=$HOME/.config -# Now update the path to include our sandbox bin directory. +# Needed to run uzbl-browser etc from here. export PATH="./sandbox/usr/local/bin:$PATH" |