From 058c026e10f784f83639bd48a67aa2e519937551 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Tue, 22 May 2007 13:02:39 +0000 Subject: [PATCH] Fixed bug with "/buffer query_name", added server and channel completion for /buffer command (bug #19928) --- ChangeLog | 4 +++- src/common/command.c | 9 +++++---- weechat/ChangeLog | 4 +++- weechat/src/common/command.c | 9 +++++---- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 453c287be..6ef801cd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,12 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-05-21 +ChangeLog - 2007-05-22 Version 0.2.5 (under dev!): + * fixed bug with "/buffer query_name", added server and channel completion + for /buffer command (bug #19928) * added cmake for weechat compile (patch #5943) * fixed IRC mode parsing when receiving modes with arguments (bug #19902) * fixed crash with IRC JOIN malformed message (bug #19891) diff --git a/src/common/command.c b/src/common/command.c index 98ffdcc28..3fffaa261 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -71,7 +71,7 @@ t_weechat_command weechat_commands[] = "server,\n" "channel: jump to buffer by server and/or channel name\n" " number: jump to buffer by number"), - "move|close|list|notify", 0, MAX_ARGS, 0, NULL, weechat_cmd_buffer }, + "move|close|list|notify|%S|%C %S|%C", 0, MAX_ARGS, 0, NULL, weechat_cmd_buffer }, { "builtin", N_("launch WeeChat/IRC builtin command (do not look at plugins handlers or aliases)"), N_("command"), N_("command: command to execute (a '/' is automatically added if not found at beginning of command)\n"), @@ -1418,10 +1418,11 @@ weechat_cmd_buffer (t_irc_server *server, t_irc_channel *channel, ptr_buffer = gui_buffer_search (argv[0], argv[1]); else { - if (irc_channel_is_channel (argv[0])) - ptr_buffer = gui_buffer_search (NULL, argv[0]); - else + ptr_server = irc_server_search (argv[0]); + if (ptr_server) ptr_buffer = gui_buffer_search (argv[0], NULL); + else + ptr_buffer = gui_buffer_search (NULL, argv[0]); } if (ptr_buffer) { diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 453c287be..6ef801cd3 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,12 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-05-21 +ChangeLog - 2007-05-22 Version 0.2.5 (under dev!): + * fixed bug with "/buffer query_name", added server and channel completion + for /buffer command (bug #19928) * added cmake for weechat compile (patch #5943) * fixed IRC mode parsing when receiving modes with arguments (bug #19902) * fixed crash with IRC JOIN malformed message (bug #19891) diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index 98ffdcc28..3fffaa261 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -71,7 +71,7 @@ t_weechat_command weechat_commands[] = "server,\n" "channel: jump to buffer by server and/or channel name\n" " number: jump to buffer by number"), - "move|close|list|notify", 0, MAX_ARGS, 0, NULL, weechat_cmd_buffer }, + "move|close|list|notify|%S|%C %S|%C", 0, MAX_ARGS, 0, NULL, weechat_cmd_buffer }, { "builtin", N_("launch WeeChat/IRC builtin command (do not look at plugins handlers or aliases)"), N_("command"), N_("command: command to execute (a '/' is automatically added if not found at beginning of command)\n"), @@ -1418,10 +1418,11 @@ weechat_cmd_buffer (t_irc_server *server, t_irc_channel *channel, ptr_buffer = gui_buffer_search (argv[0], argv[1]); else { - if (irc_channel_is_channel (argv[0])) - ptr_buffer = gui_buffer_search (NULL, argv[0]); - else + ptr_server = irc_server_search (argv[0]); + if (ptr_server) ptr_buffer = gui_buffer_search (argv[0], NULL); + else + ptr_buffer = gui_buffer_search (NULL, argv[0]); } if (ptr_buffer) {