diff --git a/ChangeLog b/ChangeLog index b3338b08e..1d8cb7741 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,12 +1,13 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.3.6-dev, 2011-07-26 +v0.3.6-dev, 2011-07-27 Version 0.3.6 (under dev!) -------------------------- +* core: allow buffer name in /buffer close * core: add support of mouse: new command /mouse, new option weechat.look.mouse and new key context "mouse" (task #5435) * core: add command /cursor (free movement of cursor on screen), with key diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt index 557370fb0..bb97cf54b 100644 --- a/doc/de/autogen/user/weechat_commands.txt +++ b/doc/de/autogen/user/weechat_commands.txt @@ -63,52 +63,52 @@ Examples: clear [|-merged|-all] move|merge unmerge [] - close [[-]] + close [[-]|] notify localvar set get | - list: alle geöffneten Buffer werden aufgelistet (Standardvorgabe) - clear: leert den Bufferinhalt. Entweder durch Angabe der Buffer-Nummer, -merged für zusammengefügte Buffer, -all für alle Buffer. Ohne Angabe eines Arguments wird der aktuelle Buffer gelöscht - move: Buffer in der Liste verschieben (kann auch relativ sein, z.B. -1) - merge: fügt den aktuellen Buffer mit einem anderen Buffer zusammen (bei einem Chat-Buffer entsteht ein Mix aus beiden Buffern - (Bei der Standardtastenbelegung kann mittels "CTRL-x" zwischen zusammengefügten Buffern umgeschaltet werden) - unmerge: trennt Buffer wieder voneinander, falls zwei Buffer die selbe Nummer teilen - close: Buffer schließen (Nummer oder Bereich ist optional) - notify: setzt Benachrichtigung-Status für aktuellen Buffer. Folgende Möglichkeiten bestimmen den Grad der Benachrichtigung: - none: keine Benachrichtigung - highlight: Benachrichtigung bei hervorgehobenen Nachrichten (Highlights) - message: Benachrichtigung bei Nachrichten von Usern + Highlights - all: Benachrichtigung bei allen Nachrichten - reset: auf Standardwert zurück setzen (all) -localvar: zeigt die lokalen Variablen für den aktuellen Buffer an - set: setzt eine Eigenschaft für aktuellen Buffer - get: zeigt eine Eigenschaft für den aktuellen Buffer an - number: Sprung von einem Buffer zu einem anderen, mögliche Optionen: - '+': relativer Sprung um 'n'-Buffer - '-': relativer Sprung, um 'n'-Buffer - '*': springt zum Buffer mit der Nummer 'n', nutzt die interne Option "weechat.look.jump_current_to_previous_buffer" - name: springt zum Buffer mit dem Namen 'xyz' + list: list buffers (without argument, this list is displayed) + clear: clear buffer content (number for a buffer, -merged for merged buffers, -all for all buffers, or nothing for current buffer) + move: move buffer in the list (may be relative, for example -1) + merge: merge current buffer to another buffer (chat area will be mix of both buffers) + (by default ctrl-x switches between merged buffers) + unmerge: unmerge buffer from other buffers which have same number + close: close buffer (number/range or name is optional) + notify: set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: + none: never + highlight: for highlights only + message: for messages from users + highlights + all: all messages + reset: reset to default value (all) +localvar: display local variables for current buffer + set: set a property for current buffer + get: display a property of current buffer + number: jump to buffer by number, possible prefix: + '+': relative jump, add number to current + '-': relative jump, sub number to current + '*': jump to number, using option "weechat.look.jump_current_to_previous_buffer" + name: jump to buffer by (partial) name -Beispiele: - leert den aktuellen Buffer: - /buffer clear - verschiebt Buffer auf Position 5: - /buffer move 5 - verbindet Buffer mit dem Core-Buffer: - /buffer merge 1 - trennt Buffer voneinander: - /buffer unmerge - schließt aktuellen Buffer: - /buffer close - schließt Buffer 5 bis 7: - /buffer close 5-7 - wechselt zum Buffer: #weechat: - /buffer #weechat - wechselt zum nächsten Buffer: - /buffer +1 +Examples: + clear current buffer: + /buffer clear + move buffer to number 5: + /buffer move 5 + merge with core buffer: + /buffer merge 1 + unmerge buffer: + /buffer unmerge + close current buffer: + /buffer close + close buffers 5 to 7: + /buffer close 5-7 + jump to #weechat: + /buffer #weechat + jump to next buffer: + /buffer +1 ........................................ [command]*`color`* definiert Farbaliase und stellt eine Palette der möglichen Farben dar:: diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt index d35e0a27f..04e6f595a 100644 --- a/doc/en/autogen/user/weechat_commands.txt +++ b/doc/en/autogen/user/weechat_commands.txt @@ -63,7 +63,7 @@ Examples: clear [|-merged|-all] move|merge unmerge [] - close [[-]] + close [[-]|] notify localvar set @@ -76,7 +76,7 @@ Examples: merge: merge current buffer to another buffer (chat area will be mix of both buffers) (by default ctrl-x switches between merged buffers) unmerge: unmerge buffer from other buffers which have same number - close: close buffer (number/range is optional) + close: close buffer (number/range or name is optional) notify: set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: none: never highlight: for highlights only diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt index 8b9a2b853..8d7a900cd 100644 --- a/doc/fr/autogen/user/weechat_commands.txt +++ b/doc/fr/autogen/user/weechat_commands.txt @@ -63,7 +63,7 @@ Exemples: clear [|-merged|-all] move|merge unmerge [] - close [[-]] + close [[-]|] notify localvar set @@ -76,7 +76,7 @@ Exemples: merge: mélanger le tampon courant avec un autre tampon (la zone de discussion sera un mélange des deux tampons) (par défaut ctrl-x bascule entre les tampons mélangés) unmerge: détacher le tampon courant des autres tampons portant le même numéro - close: fermer le tampon (nombre/intervalle optionnel) + close: fermer le tampon (nombre/intervalle ou nom optionnel) notify: définir le niveau de notification pour le tampon courant: ce niveau détermine si le buffer doit être ajouté à la hotlist ou pas: none: jamais highlight: pour les highlights seulement diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt index 3e68a51a9..ea9d7c93a 100644 --- a/doc/it/autogen/user/weechat_commands.txt +++ b/doc/it/autogen/user/weechat_commands.txt @@ -60,54 +60,54 @@ Examples: [command]*`buffer`* gestione buffer:: ........................................ /buffer list - clear [|-merged|-all] - move|merge - unmerge [] - close [[-]] - notify + clear [|-merged|-all] + move|merge + unmerge [] + close [[-]|] + notify localvar - set - get - | + set + get + | - list: elenca i buffer (senza argomento viene mostrata questa lista) - clear: pulisce il contenuto del buffer (numero per un buffer, -merged per i buffer incollati, -all per tutti i buffer o nessun parametro per quello corrente) - move: sposta il buffer nella lista (può essere relativo, ad esempio -1) - merge: unisce il buffer corrente ad un altro (l'area di chat risulterà un mix di entrambi) - (la combinazione predefinita ctrl-x alterna tra i buffer incollati) - unmerge: stacca il buffer dagli altri che hanno lo stesso numero - close: chiude buffer (numero/serie sono opzionali) - notify: imposta il livello di notifica per il buffer corrente: questo livello determina se il buffer deve essere aggiunto alla hotlist oppure no: - none: mai - highlight: solo per gli eventi - message: messaggi dagli utenti + eventi - all: tutti i messaggi - reset: ripristina al valore predefinito (tutto) -localvar: visualizza le variabili locali per il buffer corrente - set: imposta una proprietà per il buffer corrente - get: mostra una proprietà del buffer corrente - numero: passa al buffer per numero, prefisso possibile: - '+': passaggio relativo, aggiunge un numero a quello corrente - '-': passaggio relativo, sottrae un numero a quello corrente - '*': passa al numero, usando l'opzione "weechat.look.jump_current_to_previous_buffer" - nome: passa al buffer tramite nome (parziale) + list: list buffers (without argument, this list is displayed) + clear: clear buffer content (number for a buffer, -merged for merged buffers, -all for all buffers, or nothing for current buffer) + move: move buffer in the list (may be relative, for example -1) + merge: merge current buffer to another buffer (chat area will be mix of both buffers) + (by default ctrl-x switches between merged buffers) + unmerge: unmerge buffer from other buffers which have same number + close: close buffer (number/range or name is optional) + notify: set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: + none: never + highlight: for highlights only + message: for messages from users + highlights + all: all messages + reset: reset to default value (all) +localvar: display local variables for current buffer + set: set a property for current buffer + get: display a property of current buffer + number: jump to buffer by number, possible prefix: + '+': relative jump, add number to current + '-': relative jump, sub number to current + '*': jump to number, using option "weechat.look.jump_current_to_previous_buffer" + name: jump to buffer by (partial) name Examples: - pulisce il buffer corrente: + clear current buffer: /buffer clear - sposta il buffer al numero 5: + move buffer to number 5: /buffer move 5 - unisce con il buffer core: + merge with core buffer: /buffer merge 1 - stacca il buffer: + unmerge buffer: /buffer unmerge - chiude il buffer corrente: + close current buffer: /buffer close - chiude i buffer da 5 a 7: + close buffers 5 to 7: /buffer close 5-7 - passa a #weechat: + jump to #weechat: /buffer #weechat - passa al buffer successivo: + jump to next buffer: /buffer +1 ........................................ diff --git a/po/cs.po b/po/cs.po index f6c07f74b..7d4154106 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -925,15 +925,17 @@ msgstr "" msgid "manage buffers" msgstr "řídit buffery" +#, fuzzy msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" "list || clear [<číslo>|-merged|-all] || move|merge <číslo> || unmerge " "[<číslo>] || close [[-]] || notify <úroveň> || localvar || set " " || get || <číslo>|" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" " clear: clear buffer content (number for a buffer, -merged for merged " @@ -943,7 +945,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" diff --git a/po/de.po b/po/de.po index 00e3d1073..9e2908347 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" "PO-Revision-Date: 2011-07-14 20:53+0100\n" "Last-Translator: Nils Görs\n" "Language-Team: weechat-dev \n" @@ -943,15 +943,17 @@ msgstr "" msgid "manage buffers" msgstr "Buffer verwalten" +#, fuzzy msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" "list || clear [|-merged|-all] || move|merge || unmerge " "[] || close [[-]] || notify || localvar || set " " || get || |" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" " clear: clear buffer content (number for a buffer, -merged for merged " @@ -961,7 +963,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" diff --git a/po/es.po b/po/es.po index fedeed430..5b80acc56 100644 --- a/po/es.po +++ b/po/es.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" "PO-Revision-Date: 2011-07-05 15:37+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -930,15 +930,17 @@ msgstr "" msgid "manage buffers" msgstr "gestionar los buffers" +#, fuzzy msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" "list || clear [|-merged|-all] || move|merge || unmerge " "[] || close [[-]] || notify || localvar || set " " || get || |" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" " clear: clear buffer content (number for a buffer, -merged for merged " @@ -948,7 +950,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" diff --git a/po/fr.po b/po/fr.po index 80e8667d3..59ca181f7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" -"PO-Revision-Date: 2011-07-27 09:32+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" +"PO-Revision-Date: 2011-07-27 12:56+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -932,12 +932,12 @@ msgstr "gestion des tampons" msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgid "" " list: list buffers (without argument, this list is displayed)\n" @@ -948,7 +948,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" @@ -996,7 +996,7 @@ msgstr "" " (par défaut ctrl-x bascule entre les tampons mélangés)\n" " unmerge: détacher le tampon courant des autres tampons portant le même " "numéro\n" -" close: fermer le tampon (nombre/intervalle optionnel)\n" +" close: fermer le tampon (nombre/intervalle ou nom optionnel)\n" " notify: définir le niveau de notification pour le tampon courant: ce " "niveau détermine si le buffer doit être ajouté à la hotlist ou pas:\n" " none: jamais\n" diff --git a/po/hu.po b/po/hu.po index 254904722..11046350a 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" "PO-Revision-Date: 2011-05-15 10:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -913,8 +913,8 @@ msgstr "pufferek kezelése" msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" #, fuzzy @@ -927,7 +927,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" diff --git a/po/it.po b/po/it.po index 400890620..9e3be2bd2 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" "PO-Revision-Date: 2011-07-16 11:32+0200\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -924,15 +924,17 @@ msgstr "" msgid "manage buffers" msgstr "gestione buffer" +#, fuzzy msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" "list || clear [|-merged|-all] || move|merge || unmerge " "[] || close [[-]] || notify || localvar || set " " || get || |" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" " clear: clear buffer content (number for a buffer, -merged for merged " @@ -942,7 +944,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" diff --git a/po/pl.po b/po/pl.po index a891adff2..0a79ebbb6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" "PO-Revision-Date: 2011-07-05 15:38+0200\n" "Last-Translator: Krzysztof Koroscik \n" "Language-Team: weechat-dev \n" @@ -933,15 +933,17 @@ msgstr "" msgid "manage buffers" msgstr "zarządzaj buforami" +#, fuzzy msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" "list || clear [|-merged|-all] || move|merge || unmerge " "[] || close [[-]] || notify || localvar || set " " || get || |" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" " clear: clear buffer content (number for a buffer, -merged for merged " @@ -951,7 +953,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index a93566c49..37059132d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Ivan Sichmann Freitas \n" "Language-Team: weechat-dev \n" @@ -941,8 +941,8 @@ msgstr "gerenciar buffers" #, fuzzy msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" "[clear [número | -merged | -all] | move número | merge número | unmerge " "[número] | close [n1[-n2]] | list | notify nível | localvar | set property " @@ -959,7 +959,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" diff --git a/po/ru.po b/po/ru.po index b0c0b748f..c041d9c85 100644 --- a/po/ru.po +++ b/po/ru.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.6-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" "PO-Revision-Date: 2011-05-15 10:52+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -920,8 +920,8 @@ msgstr "управление буферами" msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" #, fuzzy @@ -934,7 +934,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" diff --git a/po/weechat.pot b/po/weechat.pot index 4ac479bd9..97f3a619a 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2011-07-27 09:31+0200\n" +"POT-Creation-Date: 2011-07-27 12:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -813,8 +813,8 @@ msgstr "" msgid "" "list || clear [|-merged|-all] || move|merge || unmerge " -"[] || close [[-]] || notify || localvar || set " -" || get || |" +"[] || close [[-]|] || notify || localvar || " +"set || get || |" msgstr "" msgid "" @@ -826,7 +826,7 @@ msgid "" "both buffers)\n" " (by default ctrl-x switches between merged buffers)\n" " unmerge: unmerge buffer from other buffers which have same number\n" -" close: close buffer (number/range is optional)\n" +" close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this level determines whether " "buffer will be added to hotlist or not:\n" " none: never\n" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 02de535df..bb29c987b 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -501,7 +501,7 @@ COMMAND_CALLBACK(buffer) { struct t_gui_buffer *ptr_buffer, *weechat_buffer; long number, number1, number2; - char *error, *value, *pos, *str_number1, *pos_number2, *plugin_name; + char *error, *value, *pos, *str_number1, *pos_number2; int i, target_buffer; /* make C compiler happy */ @@ -680,67 +680,76 @@ COMMAND_CALLBACK(buffer) } else { - number1 = -1; - number2 = -1; - pos = strchr (argv_eol[2], '-'); - if (pos) + if (isdigit (argv_eol[2][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_eol[2], '-'); + if (pos) { - if (pos_number2) - { - error = NULL; - number2 = strtol (pos_number2, &error, 10); - if (!error || error[0]) - return WEECHAT_RC_ERROR; - } - else - number2 = number1; + str_number1 = string_strndup (argv_eol[2], + pos - argv_eol[2]); + pos_number2 = pos + 1; } else { - number1 = -1; - number2 = -1; + str_number1 = strdup (argv_eol[2]); + pos_number2 = NULL; } - free (str_number1); - } - if ((number1 < 0) || (number2 < 0) || (number2 < number1)) - return WEECHAT_RC_ERROR; - - for (i = number2; i >= number1; i--) - { - for (ptr_buffer = last_gui_buffer; ptr_buffer; - ptr_buffer = ptr_buffer->prev_buffer) + if (str_number1) { - if (ptr_buffer->number == i) + error = NULL; + number1 = strtol (str_number1, &error, 10); + if (error && !error[0]) { - if (ptr_buffer == weechat_buffer) + if (pos_number2) { - gui_chat_printf (NULL, - _("%sError: WeeChat main buffer " - "can't be closed"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + error = NULL; + number2 = strtol (pos_number2, &error, 10); + if (!error || error[0]) + return WEECHAT_RC_ERROR; } else + number2 = number1; + } + else + { + number1 = -1; + number2 = -1; + } + free (str_number1); + } + if ((number1 >= 1) && (number2 >= 1) && (number2 >= number1)) + { + for (i = number2; i >= number1; i--) + { + for (ptr_buffer = last_gui_buffer; ptr_buffer; + ptr_buffer = ptr_buffer->prev_buffer) { - gui_buffer_close (ptr_buffer); + if (ptr_buffer->number == i) + { + 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); + } + } } } } } + else + { + ptr_buffer = gui_buffer_search_by_full_name (argv_eol[2]); + if (ptr_buffer) + gui_buffer_close (ptr_buffer); + } } return WEECHAT_RC_OK; @@ -898,24 +907,11 @@ COMMAND_CALLBACK(buffer) } else { - ptr_buffer = NULL; - pos = strchr (argv_eol[1], '.'); - if (pos) - { - plugin_name = string_strndup (argv_eol[1], pos - argv_eol[1]); - if (plugin_name) - { - ptr_buffer = gui_buffer_search_by_partial_name (plugin_name, - pos + 1); - free (plugin_name); - } - } + ptr_buffer = gui_buffer_search_by_full_name (argv_eol[1]); if (!ptr_buffer) ptr_buffer = gui_buffer_search_by_partial_name (NULL, argv_eol[1]); if (ptr_buffer) - { gui_window_switch_to_buffer (gui_current_window, ptr_buffer, 1); - } } return WEECHAT_RC_OK; @@ -5119,7 +5115,7 @@ command_init () " || clear [|-merged|-all]" " || move|merge " " || unmerge []" - " || close [[-]]" + " || close [[-]|]" " || notify " " || localvar" " || set " @@ -5138,7 +5134,7 @@ command_init () "buffers)\n" " unmerge: unmerge buffer from other buffers which have " "same number\n" - " close: close buffer (number/range is optional)\n" + " close: close buffer (number/range or name is optional)\n" " notify: set notify level for current buffer: this " "level determines whether buffer will be added to " "hotlist or not:\n" @@ -5177,16 +5173,14 @@ command_init () " || move %(buffers_numbers)" " || merge %(buffers_numbers)" " || unmerge %(buffers_numbers)" - " || close" + " || close %(buffers_plugins_names)" " || list" " || notify reset|none|highlight|message|all" " || localvar" " || set %(buffer_properties_set)" " || get %(buffer_properties_get)" - " || %(buffers_names)" - " || %(irc_channels)" - " || %(irc_privates)" - " || %(buffers_numbers)", + " || %(buffers_plugins_names)|%(buffers_names)|" + "%(irc_channels)|%(irc_privates)|%(buffers_numbers)", &command_buffer, NULL); hook_command (NULL, "color", N_("define color aliases and display palette of colors"),