blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: allow multiple arguments in command /buffer close

Browse Source
This commit is contained in:
Sébastien Helleu 2018-09-18 21:27:44 +02:00
parent 7b8faf6d97
commit 65f1c82a87
21 changed files with 163 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.adoc
View File

@ -20,6 +20,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
New features::
* core: allow multiple arguments in command /buffer close
* core: allow multiple options "-r" ("--run-command") in command line arguments (issue #1248)
* core: add option "-P" (or "--plugins") to customize the plugins to load at startup
* core: allow partial buffer name in command /buffer close (issue #1226)

2
doc/de/autogen/user/weechat_commands.adoc
View File

@ -79,7 +79,7 @@ Beispiele:
hide [<number>|<name>|-all [<number>|<name>...]]
unhide [<number>|<name>|-all [<number>|<name>...]]
renumber [<number1> [<number2> [<start>]]]
close [<n1>[-<n2>]|<name>]
close [<n1>[-<n2>]|<name>...]
notify <level>
localvar
set <property> [<value>]

2
doc/en/autogen/user/weechat_commands.adoc
View File

@ -79,7 +79,7 @@ Examples:
hide [<number>|<name>|-all [<number>|<name>...]]
unhide [<number>|<name>|-all [<number>|<name>...]]
renumber [<number1> [<number2> [<start>]]]
close [<n1>[-<n2>]|<name>]
close [<n1>[-<n2>]|<name>...]
notify <level>
localvar
set <property> [<value>]

2
doc/fr/autogen/user/weechat_commands.adoc
View File

@ -79,7 +79,7 @@ Exemples :
hide [<nombre>|<nom>|-all [<nombre>|<nom>...]]
unhide [<nombre>|<nom>|-all [<nombre>|<nom>...]]
renumber <nombre1> [<nombre2> [<départ>]]
close [<n1>[-<n2>]|<nom>]
close [<n1>[-<n2>]|<nom>...]
notify <niveau>
localvar
set <propriété> [<valeur>]

2
doc/it/autogen/user/weechat_commands.adoc
View File

@ -79,7 +79,7 @@ Examples:
hide [<number>|<name>|-all [<number>|<name>...]]
unhide [<number>|<name>|-all [<number>|<name>...]]
renumber [<number1> [<number2> [<start>]]]
close [<n1>[-<n2>]|<name>]
close [<n1>[-<n2>]|<name>...]
notify <level>
localvar
set <property> [<value>]

2
doc/ja/autogen/user/weechat_commands.adoc
View File

@ -79,7 +79,7 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態
hide [<number>|<name>|-all [<number>|<name>...]]
unhide [<number>|<name>|-all [<number>|<name>...]]
renumber [<number1> [<number2> [<start>]]]
close [<n1>[-<n2>]|<name>]
close [<n1>[-<n2>]|<name>...]
notify <level>
localvar
set <property> [<value>]

30
doc/pl/autogen/user/weechat_commands.adoc
View File

@ -69,22 +69,22 @@ Przykłady:
----
/buffer list
add [-free] [-switch] <nazwa>
clear [<numer>|<nazwa>|-merged|-all [<numer>|<nazwa>...]]
move <numer>|-|+
swap <numer1>|<nazwa1> [<numer2>|<nazwa2>]
cycle <numer>|<nazwa> [<numer>|<nazwa>...]
merge <numer>|<nazwa>
unmerge [<numer>|-all]
hide [<numer>|<nazwa>|-all [<numer>|<nazwa>...]]
unhide [<numer>|<nazwa>|-all [<numer>|<nazwa>...]]
renumber [<numer1> [<numer2> [<start>]]]
close [<n1>[-<n2>]|<nazwa>]
notify <poziom>
add [-free] [-switch] <name>
clear [<number>|<name>|-merged|-all [<number>|<name>...]]
move <number>|-|+
swap <number1>|<name1> [<number2>|<name2>]
cycle <number>|<name> [<number>|<name>...]
merge <number>|<name>
unmerge [<number>|-all]
hide [<number>|<name>|-all [<number>|<name>...]]
unhide [<number>|<name>|-all [<number>|<name>...]]
renumber [<number1> [<number2> [<start>]]]
close [<n1>[-<n2>]|<name>...]
notify <level>
localvar
set <opcja> [<value>]
get <opcja>
<numer>|-|+|<nazwa>
set <property> [<value>]
get <property>
<number>|-|+|<name>
list: wyświetla listę buforów (bez podania argumenty wyświetlana jest ta lista)
add: dodaje nowy bufor (może zostać zamknięty komendą "/buffer close" albo "q")

8
po/cs.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1205,9 +1205,9 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
"list || clear [<číslo>|-merged|-all] || move|merge <číslo> || unmerge "
"[<číslo>] || close [<n1>[-<n2>]] || notify <úroveň> || localvar || set "

9
po/de.po
View File

@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-09-09 10:03+0200\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <kde-i18n-de@kde.org>\n"
@ -1234,15 +1234,16 @@ msgstr ""
msgid "manage buffers"
msgstr "Buffer verwalten"
#, fuzzy
msgid ""
"list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
"list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "

8
po/es.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1201,9 +1201,9 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
"list || clear [<número>|<nombre>|-merged|-all] || move|merge <número> || "
"swap<número1>|<nombre1> [<número2>|<nombre2>] || unmerge [<número>|-all] || "

12
po/fr.po
View File

@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"PO-Revision-Date: 2018-09-09 10:03+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-09-18 21:26+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@ -1214,16 +1214,16 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
"list || add [-free] [-switch] <nom> || clear [<nombre>|<nom>|-merged|-all "
"[<nombre>|<nom>...]] || move <nombre>|-|+ || swap <nombre1>|<nom1> "
"[<nombre2>|<nom2>] || cycle <nombre>|<nom> [<nombre>|<nom>...] || merge "
"<nombre>|<nom> || unmerge [<nombre>|-all] || hide [<nombre>|<nom>|-all "
"[<nombre>|<nom>...]] || unhide [<nombre>|<nom>|-all [<nombre>|<nom>...]] || "
"renumber <nombre1> [<nombre2> [<départ>]] || close [<n1>[-<n2>]|<nom>] || "
"renumber <nombre1> [<nombre2> [<départ>]] || close [<n1>[-<n2>]|<nom>...] || "
"notify <niveau> || localvar || set <propriété> [<valeur>] || get <propriété> "
"|| <nombre>|<nom>"

8
po/hu.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1173,9 +1173,9 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
#, fuzzy

8
po/it.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1179,9 +1179,9 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
"list || clear [<numero>|<nome>|-merged|-all] || move|merge <numero> || swap "
"<numero1>|<nome1> [<numero2>|<nome2>] || unmerge [<numero>|-all] || close "

9
po/ja.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-09-09 10:05+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@ -1189,15 +1189,16 @@ msgstr ""
msgid "manage buffers"
msgstr "バッファの管理"
#, fuzzy
msgid ""
"list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
"list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "

9
po/pl.po
View File

@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-09-09 10:05+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
"Language-Team: Polish <soltys1@gmail.com>\n"
@ -1212,15 +1212,16 @@ msgstr ""
msgid "manage buffers"
msgstr "zarządzaj buforami"
#, fuzzy
msgid ""
"list || add [-free] [-switch] <name> || clear [<number>|<name>|-merged|-all "
"[<number>|<name>...]] || move <number>|-|+ || swap <number1>|<name1> "
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
"list || add [-free] [-switch] <nazwa> || clear [<numer>|<nazwa>|-merged|-all "
"[<numer>|<nazwa>...]] || move <numer>|-|+ || swap <numer1>|<nazwa1> "

8
po/pt.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-03-31 15:36+0200\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese <>\n"
@ -1205,9 +1205,9 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
"list || clear [<número>|<nome>|-merged|-all [<número>|<nome>...]] || move "
"<número>|-|+ || swap <número1>|<nome1> [<número2>|<nome2>] || cycle <número>|"

8
po/pt_BR.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-03-31 15:37+0200\n"
"Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1222,9 +1222,9 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
"list || clear [<número>|<nome>|-merged|-all] || move|merge <número> || swap "
"<número1>|<nome1> [<número2>|<nome2>] || unmerge [<número>|-all] || close "

8
po/ru.po
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2018-03-31 15:37+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1194,9 +1194,9 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
#, fuzzy

8
po/tr.po
View File

@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2017-06-26 23:33+0200\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1064,9 +1064,9 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
msgid ""

8
po/weechat.pot
View File

@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2018-09-09 10:02+0200\n"
"POT-Creation-Date: 2018-09-18 21:23+0200\n"
"PO-Revision-Date: 2014-08-16 10:27+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@ -1068,9 +1068,9 @@ msgid ""
"[<number2>|<name2>] || cycle <number>|<name> [<number>|<name>...] || merge "
"<number>|<name> || unmerge [<number>|-all] || hide [<number>|<name>|-all "
"[<number>|<name>...]] || unhide [<number>|<name>|-all [<number>|<name>...]] "
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] "
"|| notify <level> || localvar || set <property> [<value>] || get <property> "
"|| <number>|-|+|<name>"
"|| renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|"
"<name>...] || notify <level> || localvar || set <property> [<value>] || get "
"<property> || <number>|-|+|<name>"
msgstr ""
msgid ""

178
src/core/wee-command.c
View File

@ -41,6 +41,7 @@
#include "weechat.h"
#include "wee-command.h"
#include "wee-arraylist.h"
#include "wee-config.h"
#include "wee-config-file.h"
#include "wee-debug.h"
@ -543,10 +544,11 @@ command_buffer_display_localvar (void *data,
COMMAND_CALLBACK(buffer)
{
struct t_gui_buffer *ptr_buffer, *ptr_buffer1, *ptr_buffer2;
struct t_gui_buffer *ptr_prev_buffer, *weechat_buffer;
struct t_gui_buffer *weechat_buffer;
struct t_arraylist *buffers_to_close;
long number, number1, number2, numbers[3];
char *error, *value, *pos, *str_number1, *pos_number2;
int i, error_main_buffer, num_buffers, count, prev_number, clear_number;
int i, count, prev_number, clear_number;
int buffer_found, arg_name, type_free, switch_to_buffer;
/* make C compiler happy */
@ -963,126 +965,116 @@ COMMAND_CALLBACK(buffer)
/* close buffer */
if (string_strcasecmp (argv[1], "close") == 0)
{
weechat_buffer = gui_buffer_search_main ();
buffers_to_close = arraylist_new (32, 0, 0, NULL, NULL, NULL, NULL);
if (argc < 3)
{
if (buffer == weechat_buffer)
{
gui_chat_printf (NULL,
_("%sError: WeeChat main buffer can't be "
"closed"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
}
else
{
gui_buffer_close (buffer);
}
arraylist_add (buffers_to_close, buffer);
}
else
{
if (isdigit ((unsigned char)argv_eol[2][0]))
for (i = 2; i < argc; i++)
{
number1 = -1;
number2 = -1;
pos = strchr (argv_eol[2], '-');
if (pos)
if (isdigit ((unsigned char)argv[i][0]))
{
str_number1 = string_strndup (argv_eol[2],
pos - argv_eol[2]);
pos_number2 = pos + 1;
}
else
{
str_number1 = strdup (argv_eol[2]);
pos_number2 = NULL;
}
if (str_number1)
{
error = NULL;
number1 = strtol (str_number1, &error, 10);
if (error && !error[0])
number1 = -1;
number2 = -1;
pos = strchr (argv[i], '-');
if (pos)
{
if (pos_number2)
{
error = NULL;
number2 = strtol (pos_number2, &error, 10);
if (!error || error[0])
{
free (str_number1);
COMMAND_ERROR;
}
}
else
number2 = number1;
str_number1 = string_strndup (argv[i],
pos - argv[i]);
pos_number2 = pos + 1;
}
else
{
number1 = -1;
number2 = -1;
str_number1 = strdup (argv[i]);
pos_number2 = NULL;
}
free (str_number1);
}
if ((number1 >= 1) && (number2 >= 1) && (number2 >= number1))
{
error_main_buffer = 0;
num_buffers = 0;
ptr_buffer = last_gui_buffer;
while (ptr_buffer)
if (str_number1)
{
ptr_prev_buffer = ptr_buffer->prev_buffer;
if (ptr_buffer->number < number1)
break;
if (ptr_buffer->number <= number2)
error = NULL;
number1 = strtol (str_number1, &error, 10);
if (error && !error[0])
{
num_buffers++;
if (ptr_buffer == weechat_buffer)
if (pos_number2)
{
error_main_buffer = 1;
error = NULL;
number2 = strtol (pos_number2, &error, 10);
if (!error || error[0])
{
free (str_number1);
COMMAND_ERROR;
}
}
else
{
gui_buffer_close (ptr_buffer);
}
number2 = number1;
}
ptr_buffer = ptr_prev_buffer;
else
{
free (str_number1);
COMMAND_ERROR;
}
free (str_number1);
}
if ((number1 >= 1) && (number2 >= 1) && (number2 >= number1))
{
ptr_buffer = gui_buffers;
while (ptr_buffer && (ptr_buffer->number <= number2))
{
if (ptr_buffer->number >= number1)
{
arraylist_add (buffers_to_close,
ptr_buffer);
}
ptr_buffer = ptr_buffer->next_buffer;
}
}
}
else
{
ptr_buffer = gui_buffer_search_by_full_name (argv[i]);
if (!ptr_buffer)
{
ptr_buffer = gui_buffer_search_by_partial_name (
NULL, argv[i]);
}
if (ptr_buffer)
arraylist_add (buffers_to_close, ptr_buffer);
}
}
}
weechat_buffer = gui_buffer_search_main ();
for (i = 0; i < arraylist_size (buffers_to_close); i++)
{
ptr_buffer = (struct t_gui_buffer *)arraylist_get (buffers_to_close,
i);
if (!gui_buffer_valid (ptr_buffer))
continue;
if (ptr_buffer == weechat_buffer)
{
if (arraylist_size (buffers_to_close) == 1)
{
/*
* display error for main buffer if it was the only
* buffer to close with matching number
*/
if (error_main_buffer && (num_buffers <= 1))
{
gui_chat_printf (NULL,
_("%sError: WeeChat main "
"buffer can't be closed"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
}
gui_chat_printf (NULL,
_("%sError: WeeChat main buffer can't be "
"closed"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
}
}
else
{
ptr_buffer = gui_buffer_search_by_full_name (argv_eol[2]);
if (!ptr_buffer)
{
ptr_buffer = gui_buffer_search_by_partial_name (
NULL, argv_eol[2]);
}
if (ptr_buffer)
{
if (ptr_buffer == weechat_buffer)
{
gui_chat_printf (NULL,
_("%sError: WeeChat main buffer can't "
"be closed"),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
}
else
gui_buffer_close (ptr_buffer);
}
gui_buffer_close (ptr_buffer);
}
}
arraylist_free (buffers_to_close);
return WEECHAT_RC_OK;
}
@ -7109,7 +7101,7 @@ command_init ()
" || hide [<number>|<name>|-all [<number>|<name>...]]"
" || unhide [<number>|<name>|-all [<number>|<name>...]]"
" || renumber [<number1> [<number2> [<start>]]]"
" || close [<n1>[-<n2>]|<name>]"
" || close [<n1>[-<n2>]|<name>...]"
" || notify <level>"
" || localvar"
" || set <property> [<value>]"
@ -7195,7 +7187,7 @@ command_init ()
" || unhide %(buffers_numbers)|%(buffers_plugins_names)|-all "
"%(buffers_numbers)|%(buffers_plugins_names)|%*"
" || renumber %(buffers_numbers) %(buffers_numbers) %(buffers_numbers)"
" || close %(buffers_plugins_names)"
" || close %(buffers_plugins_names)|%*"
" || list"
" || notify reset|none|highlight|message|all"
" || localvar"