From 1f027dbeb11ec5aaad2f06dc8051ecfc6756dfde Mon Sep 17 00:00:00 2001
From: Sebastien Helleu <flashcode@flashtux.org>
Date: Tue, 12 Jul 2011 11:20:28 +0200
Subject: [PATCH] core: fix completion for command arguments when same command
 exists in many plugins (bug #33753)

---
 ChangeLog                |  4 +++-
 src/gui/gui-completion.c | 24 +++++++++++++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d4ed67c02..ee250898c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.3.6-dev, 2011-07-10
+v0.3.6-dev, 2011-07-12
 
 
 Version 0.3.6 (under dev!)
 --------------------------
 
+* core: fix completion for command arguments when same command exists in many
+  plugins (bug #33753)
 * core: add context "search" for keys (to define keys used during search in
   buffer with ctrl+"r")
 * core: add new option weechat.look.separator_vertical, rename option
diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c
index fde3df9ad..4bdcc9c98 100644
--- a/src/gui/gui-completion.c
+++ b/src/gui/gui-completion.c
@@ -46,6 +46,7 @@
 #include "../core/wee-utf8.h"
 #include "../plugins/plugin.h"
 #include "gui-completion.h"
+#include "gui-buffer.h"
 
 
 /*
@@ -213,9 +214,12 @@ gui_completion_stop (struct t_gui_completion *completion,
  */
 
 struct t_hook *
-gui_completion_search_command (const char *command)
+gui_completion_search_command (struct t_weechat_plugin *plugin,
+                               const char *command)
 {
-    struct t_hook *ptr_hook;
+    struct t_hook *ptr_hook, *hook_for_other_plugin;
+    
+    hook_for_other_plugin = NULL;
     
     for (ptr_hook = weechat_hooks[HOOK_TYPE_COMMAND]; ptr_hook;
          ptr_hook = ptr_hook->next_hook)
@@ -225,11 +229,15 @@ gui_completion_search_command (const char *command)
             && HOOK_COMMAND(ptr_hook, command)[0]
             && (string_strcasecmp (HOOK_COMMAND(ptr_hook, command),
                                    command) == 0))
-            return ptr_hook;
+        {
+            if (ptr_hook->plugin == plugin)
+                return ptr_hook;
+            
+            hook_for_other_plugin = ptr_hook;
+        }
     }
     
-    /* command not found */
-    return NULL;
+    return hook_for_other_plugin;
 }
 
 /*
@@ -494,7 +502,8 @@ gui_completion_get_template_for_args (struct t_gui_completion *completion,
         && (HOOK_COMMAND(hook_command, cplt_templates)[0][1] == '%')
         && (HOOK_COMMAND(hook_command, cplt_templates)[0][1]))
     {
-        hook_command = gui_completion_search_command (HOOK_COMMAND(hook_command, cplt_templates)[0] + 2);
+        hook_command = gui_completion_search_command (completion->buffer->plugin,
+                                                      HOOK_COMMAND(hook_command, cplt_templates)[0] + 2);
         if (!hook_command
             || ((HOOK_COMMAND(hook_command, cplt_templates)[0][0] == '%')
                 && (HOOK_COMMAND(hook_command, cplt_templates)[0][1] == '%')))
@@ -537,7 +546,8 @@ gui_completion_build_list (struct t_gui_completion *completion)
     
     repeat_last = 0;
     
-    ptr_hook = gui_completion_search_command (completion->base_command);
+    ptr_hook = gui_completion_search_command (completion->buffer->plugin,
+                                              completion->base_command);
     if (!ptr_hook || !HOOK_COMMAND(ptr_hook, completion))
     {
         completion->context = GUI_COMPLETION_AUTO;