merge in anydots stuff
authorDieter Plaetinck <dieter@plaetinck.be>
Sun, 3 May 2009 20:00:05 +0000 (22:00 +0200)
committerDieter Plaetinck <dieter@plaetinck.be>
Sun, 3 May 2009 20:00:05 +0000 (22:00 +0200)
1  2 
examples/configs/sampleconfig
examples/configs/sampleconfig-dev
uzbl.c

Simple merge
Simple merge
diff --cc uzbl.c
--- 1/uzbl.c
--- 2/uzbl.c
+++ b/uzbl.c
@@@ -308,21 -293,20 +294,21 @@@ VIEWFUNC(go_forward
  
  static struct {char *name; Command command;} cmdlist[] =
  {
-     { "back",           view_go_back       },
-     { "forward",        view_go_forward    },
-     { "scroll_vert",    scroll_vert        },
-     { "scroll_horz",    scroll_horz        },
-     { "reload",         view_reload,       }, //Buggy
-     { "refresh",        view_reload,       }, /* for convenience, will change */
-     { "stop",           view_stop_loading, },
-     { "zoom_in",        view_zoom_in,      }, //Can crash (when max zoom reached?).
-     { "zoom_out",       view_zoom_out,     },
-     { "uri",            load_uri           },
-     { "toggle_status",  toggle_status_cb   },
-     { "spawn",          spawn              },
-     { "exit",           close_uzbl         },
-     { "search",         search_text        },
-     { "insert_mode",    set_insert_mode    }
+     { "back",             view_go_back            },
+     { "forward",          view_go_forward         },
+     { "scroll_vert",      scroll_vert             },
+     { "scroll_horz",      scroll_horz             },
+     { "reload",           view_reload,            }, 
+     { "reload_ign_cache", view_reload_bypass_cache},
+     { "stop",             view_stop_loading,      },
+     { "zoom_in",          view_zoom_in,           }, //Can crash (when max zoom reached?).
+     { "zoom_out",         view_zoom_out,          },
+     { "uri",              load_uri                },
+     { "toggle_status",    toggle_status_cb        },
+     { "spawn",            spawn                   },
+     { "exit",             close_uzbl              },
++    { "search",           search_text             },
+     { "insert_mode",      set_insert_mode         }
  };
  
  static void