Merge commit 'dieterbe/experimental' into experimental

Conflicts solved:
	uzbl.c

1 files changed, 6 insertions, 3 deletions

diff --git a/uzbl.c b/uzbl.c
index a596b0e..8ed8788 100644
--- a/uzbl.c
+++ b/uzbl.c
@@ -988,10 +988,13 @@ keycmd_nl (WebKitWebView *page, GArray *argv, GString *result) {
 
 static void
 keycmd_bs (WebKitWebView *page, GArray *argv, GString *result) {
+    gchar *prev;
     (void)page;
     (void)argv;
     (void)result;
-    g_string_truncate(uzbl.state.keycmd, uzbl.state.keycmd->len - 1);
+    prev = g_utf8_find_prev_char(uzbl.state.keycmd->str, uzbl.state.keycmd->str + uzbl.state.keycmd->len);
+    if (prev)
+      g_string_truncate(uzbl.state.keycmd, prev - uzbl.state.keycmd->str);
     update_title();
 }
 
@@ -1764,9 +1767,9 @@ parse_cmd_line(const char *ctl_line, GString *result) {
 
 static gchar*
 build_stream_name(int type, const gchar* dir) {
-    char *xwin_str;
+    char *xwin_str = NULL;
     State *s = &uzbl.state;
-    gchar *str;
+    gchar *str = NULL;
 
     xwin_str = itos((int)uzbl.xwin);
     if (type == FIFO) {