From 0918db5766af866fda6ee39783ebe83ae93b910c Mon Sep 17 00:00:00 2001
From: Lucas de Vries <lucasdevries@gmail.com>
Date: Wed, 11 Jun 2008 13:24:38 +0200
Subject: [PATCH] [tabulous] Fix merge to wrong tabindex

---
 tabulous.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tabulous.lua b/tabulous.lua
index 414e3571..050b4f23 100644
--- a/tabulous.lua
+++ b/tabulous.lua
@@ -22,6 +22,7 @@ local client = client
 local table = table
 local pairs = pairs
 local awful = awful
+local print = print
 
 -- Reset env
 setfenv(1, P)
@@ -199,11 +200,14 @@ local function client_tab(tabindex, cl)
             client_display(tabindex, c)
 
             awful.hooks.userhook_call('tabbed', {c})
-        else
+        elseif x ~= tabindex then
             -- Merge two tabbed views
+            local cc = tabbed[tabindex][1]
             local clients = client_get_clients(x)
             client_untab_all(x)
 
+            tabindex = client_find_tabindex(cc)
+
             for i,b in pairs(clients) do
                 client_tab(tabindex, b)
             end