Merge branch 'experimental' into bf2

Conflicts:
	examples/config/uzbl/config

diff --cc examples/config/uzbl/config
index 890a0b9,04e482b..efc4780
--- 1/examples/config/uzbl/config
--- 2/examples/config/uzbl/config
+++ b/examples/config/uzbl/config
@@@ -8,9 -9,10 +8,10 @@@ set download_handler = spawn $XDG_DATA_
  set cookie_handler   = spawn $XDG_DATA_HOME/uzbl/scripts/cookies.py
  #set new_window      = sh 'echo uri "$8" > $4' # open in same window
  set new_window       = sh 'uzbl -u $8' # equivalent to the default behaviour
+ set scheme_handler   = spawn $XDG_DATA_HOME/uzbl/scripts/scheme.py
 -set load_start_handler = set status_message = <span foreground="khaki">wait</span>
 +set load_start_handler = chain 'set keycmd = ' 'set status_message = <span foreground="khaki">wait</span>'
  set load_commit_handler = set status_message = <span foreground="green">recv</span>
 -set load_finish_handler = set status_message = <span foreground="gold">done</span>
 +set load_finish_handler = chain 'set status_message = <span foreground="gold">done</span>' 'spawn $XDG_DATA_HOME/uzbl/scripts/history.sh'
  
  
  

diff --cc uzbl.c
index d016176,d0b2a64..1bb5ee2
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -137,9 -137,11 +137,10 @@@ const struct var_name_to_ptr_t 
      { "load_finish_handler",    PTR_V_STR(uzbl.behave.load_finish_handler,      1,   NULL)},
      { "load_start_handler",     PTR_V_STR(uzbl.behave.load_start_handler,       1,   NULL)},
      { "load_commit_handler",    PTR_V_STR(uzbl.behave.load_commit_handler,      1,   NULL)},
 -    { "history_handler",        PTR_V_STR(uzbl.behave.history_handler,          1,   NULL)},
      { "download_handler",       PTR_V_STR(uzbl.behave.download_handler,         1,   NULL)},
      { "cookie_handler",         PTR_V_STR(uzbl.behave.cookie_handler,           1,   cmd_cookie_handler)},
-     { "new_window",             PTR_V_STR(uzbl.behave.new_window,               1,   cmd_new_window)},
+     { "new_window",             PTR_V_STR(uzbl.behave.new_window,               1,   NULL)},
+     { "scheme_handler",         PTR_V_STR(uzbl.behave.scheme_handler,           1,   cmd_scheme_handler)},
      { "fifo_dir",               PTR_V_STR(uzbl.behave.fifo_dir,                 1,   cmd_fifo_dir)},
      { "socket_dir",             PTR_V_STR(uzbl.behave.socket_dir,               1,   cmd_socket_dir)},
      { "http_debug",             PTR_V_INT(uzbl.behave.http_debug,               1,   cmd_http_debug)},
@@@ -2303,8 -2369,10 +2354,9 @@@ create_browser () 
      g_signal_connect (G_OBJECT (g->web_view), "load-progress-changed", G_CALLBACK (progress_change_cb), g->web_view);
      g_signal_connect (G_OBJECT (g->web_view), "load-committed", G_CALLBACK (load_commit_cb), g->web_view);
      g_signal_connect (G_OBJECT (g->web_view), "load-started", G_CALLBACK (load_start_cb), g->web_view);
 -    g_signal_connect (G_OBJECT (g->web_view), "load-finished", G_CALLBACK (log_history_cb), g->web_view);
      g_signal_connect (G_OBJECT (g->web_view), "load-finished", G_CALLBACK (load_finish_cb), g->web_view);
      g_signal_connect (G_OBJECT (g->web_view), "hovering-over-link", G_CALLBACK (link_hover_cb), g->web_view);
+     g_signal_connect (G_OBJECT (g->web_view), "navigation-policy-decision-requested", G_CALLBACK (navigation_decision_cb), g->web_view);
      g_signal_connect (G_OBJECT (g->web_view), "new-window-policy-decision-requested", G_CALLBACK (new_window_cb), g->web_view);
      g_signal_connect (G_OBJECT (g->web_view), "download-requested", G_CALLBACK (download_cb), g->web_view);
      g_signal_connect (G_OBJECT (g->web_view), "create-web-view", G_CALLBACK (create_web_view_cb), g->web_view);

diff --cc uzbl.h
Simple merge