From: Daniel Carl <danielcarl@gmx.de>
Date: Wed, 13 Mar 2013 23:54:28 +0000 (+0100)
Subject: Merge branch 'single-client'
X-Git-Url: https://git.owens.tech///git?a=commitdiff_plain;h=e433d62292766d885b2d565371a696d45be7cd4b;p=vimb.git

Merge branch 'single-client'

Conflicts:
	src/url_history.c
---

e433d62292766d885b2d565371a696d45be7cd4b
diff --cc src/completion.c
index eee21e7,b5a1e8b..c5ae3dd
--- a/src/completion.c
+++ b/src/completion.c
@@@ -80,11 -84,11 +84,12 @@@ gboolean completion_complete(Client* c
          );
          g_list_free(source);
      } else if (!strncmp(input, ":tabopen ", 9)) {
-         source = url_history_get_all();
-         vp.comps.completions = completion_init_completion(
-             vp.comps.completions, source, (Comp_Func)util_strcasestr, &input[9], ":tabopen "
+         url_history_get_all(&source);
+         c->comps.completions = completion_init_completion(
+             c,
+             c->comps.completions, source, (Comp_Func)util_strcasestr, &input[9], ":tabopen "
          );
 +        g_list_free(source);
      } else {
          source = g_hash_table_get_keys(core.behave.commands);
          source = g_list_sort(source, (GCompareFunc)g_strcmp0);