core: add option "swap" for command /buffer (task #11373)

ChangeLog

@@ -7,6 +7,7 @@ v0.3.9-dev, 2012-07-29
 Version 0.3.9 (under dev!)
 --------------------------
 
+* core: add option "swap" for command /buffer (task #11373)
 * core: fix names of cache variables in configure.in (bug #36971)
 * core: scroll to bottom of window after reaching first or last highlight with
   keys alt+"p" / alt+"n"

doc/de/autogen/user/weechat_commands.txt

@@ -63,6 +63,7 @@ Beispiele:
 /buffer  list
          clear [<number>|<name>|-merged|-all]
          move|merge <number>
+         swap <number1>|<name1> [<number2>|<name2>]
          unmerge [<number>|-all]
          close [<n1>[-<n2>]|<name>]
          notify <level>
@@ -71,44 +72,49 @@ Beispiele:
          get <property>
          <number>|<name>
 
-    list: alle geöffneten Buffer werden aufgelistet (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
-   clear: leert den Inhalt des Buffers (entweder durch Angabe der entsprechenden Nummer des Buffers oder "-merged " für zusammengefügte Buffer oder "-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 den Status der Benachrichtigung für den 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: Benachrichtigung auf Standardwert zurück setzen (all)
-localvar: zeigt die lokalen Variablen für den aktuellen Buffer an
-     set: setzt eine Eigenschaft für den aktuellen Buffer
-     get: zeigt eine Eigenschaft für den aktuellen Buffer an
-  number: wechselt von einem Buffer zu einem anderen, mögliche Optionen:
-          '+': relativer Sprung um 'n'-Buffer
-          '-': relativer Sprung, um 'n'-Buffer
-          '*': wechselt zum Buffer mit der Nummer 'n'; nutzt die interne Option "weechat.look.jump_current_to_previous_buffer"
-    name: wechselt zum Buffer mit dem angegebenen Namen
+    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)
+    swap: swap two buffers (swap with current buffer if only one number/name given)
+   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:
+Examples:
+  clear current buffer:
     /buffer clear
-  verschiebt Buffer auf Position 5:
+  move buffer to number 5:
     /buffer move 5
-  verbindet Buffer mit dem Core-Buffer:
+  swap buffer 1 with 3:
+    /buffer swap 1 3
+  swap buffer #weechat with current buffer:
+    /buffer swap #weechat
+  merge with core buffer:
     /buffer merge 1
-  trennt Buffer voneinander:
+  unmerge buffer:
     /buffer unmerge
-  schließt aktuellen Buffer:
+  close current buffer:
     /buffer close
-  schließt Buffer 5 bis 7:
+  close buffers 5 to 7:
     /buffer close 5-7
-  wechselt zum Buffer: #weechat:
+  jump to #weechat:
     /buffer #weechat
-  wechselt zum nächsten Buffer:
+  jump to next buffer:
     /buffer +1
 ........................................
 

doc/en/autogen/user/weechat_commands.txt

@@ -63,6 +63,7 @@ Examples:
 /buffer  list
          clear [<number>|<name>|-merged|-all]
          move|merge <number>
+         swap <number1>|<name1> [<number2>|<name2>]
          unmerge [<number>|-all]
          close [<n1>[-<n2>]|<name>]
          notify <level>
@@ -74,6 +75,7 @@ Examples:
     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)
+    swap: swap two buffers (swap with current buffer if only one number/name given)
    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
@@ -98,6 +100,10 @@ Examples:
     /buffer clear
   move buffer to number 5:
     /buffer move 5
+  swap buffer 1 with 3:
+    /buffer swap 1 3
+  swap buffer #weechat with current buffer:
+    /buffer swap #weechat
   merge with core buffer:
     /buffer merge 1
   unmerge buffer:

doc/fr/autogen/user/weechat_commands.txt

@@ -63,6 +63,7 @@ Exemples:
 /buffer  list
          clear [<nombre>|<nom>|-merged|-all]
          move|merge <nombre>
+         swap <nombre1>|<nom1> [<nombre2>|<nom2>]
          unmerge [<nombre>|-all]
          close [<n1>[-<n2>]|<nom>]
          notify <niveau>
@@ -74,6 +75,7 @@ Exemples:
     list: lister les tampons ouverts (sans paramètre, cette liste est affichée)
    clear: effacer le contenu du tampon (un numéro pour un tampon, -merged pour les tampons mélangés, -all pour tous les tampons, ou rien pour le tampon courant)
     move: déplacer le tampon dans la liste (peut être relatif, par exemple -1)
+    swap: échanger deux tampons (échanger avec le tampon courant si un seul numéro/nom donné)
    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
@@ -98,6 +100,10 @@ Exemples:
     /buffer clear
   déplacer le tampon vers le numéro 5:
     /buffer move 5
+  échanger le tampon 1 avec le 3:
+    /buffer swap 1 3
+  échanger le tampon #weechat avec le tampon courant:
+    /buffer swap #weechat
   mélanger avec le tampon core:
     /buffer merge 1
   détacher le tampon:

doc/it/autogen/user/weechat_commands.txt

@@ -61,54 +61,60 @@ Esempi:
 [command]*`buffer`* gestione buffer::
 ........................................
 /buffer  list
-         clear [<numero>|<nome>|-merged|-all]
-         move|merge <numero>
-         unmerge [<numero>|-all]
-         close [<n1>[-<n2>]|<nome>]
-         notify <livello>
+         clear [<number>|<name>|-merged|-all]
+         move|merge <number>
+         swap <number1>|<name1> [<number2>|<name2>]
+         unmerge [<number>|-all]
+         close [<n1>[-<n2>]|<name>]
+         notify <level>
          localvar
-         set <proprietà> <valore>
-         get <proprietà>
-         <number>|<nome>
+         set <property> <value>
+         get <property>
+         <number>|<name>
 
-    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 oppure nome 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)
+    swap: swap two buffers (swap with current buffer if only one number/name given)
+   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:
+  swap buffer 1 with 3:
+    /buffer swap 1 3
+  swap buffer #weechat with current buffer:
+    /buffer swap #weechat
+  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
 ........................................
 

po/cs.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -212,6 +212,10 @@ msgstr "  %s[%s%d%s]%s (%s) %s%s%s (notifikace: %s)"
 msgid "%sError: incorrect buffer number"
 msgstr "%sChyba: nekorektní číslo bufferu"
 
+#, fuzzy, c-format
+msgid "%sError: buffer not found"
+msgstr "%sChyba: filtr \"%s\" nenalezen"
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sChyba: hlavní buffer WeeChat nemůže být zavřen"
@@ -943,9 +947,10 @@ msgstr "řídit buffery"
 
 #, fuzzy
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || 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 "
@@ -957,6 +962,8 @@ msgid ""
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -984,6 +991,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

po/de.po

@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: 2012-07-22 23:37+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -228,6 +228,10 @@ msgstr "  %s[%s%d%s]%s (%s) %s%s%s (Benachrichtigung: %s)"
 msgid "%sError: incorrect buffer number"
 msgstr "%sFehler: falsche Nummer für Buffer"
 
+#, fuzzy, c-format
+msgid "%sError: buffer not found"
+msgstr "%sFehler: Filter \"%s\" nicht gefunden"
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sFehler: Der WeeChat-Hauptbuffer kann nicht geschlossen werden"
@@ -961,20 +965,25 @@ msgstr ""
 msgid "manage buffers"
 msgstr "Buffer verwalten"
 
+#, fuzzy
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || close "
+"[<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> <value> "
+"|| get <property> || <number>|<name>"
 msgstr ""
 "list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
 "unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
 "localvar || set <property> <value> || get <property> || <number>|<name>"
 
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1002,6 +1011,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

po/es.po

@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: 2012-07-27 12:16+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -215,6 +215,10 @@ msgstr "  %s[%s%d%s]%s (%s) %s%s%s (aviso: %s)"
 msgid "%sError: incorrect buffer number"
 msgstr "%sError: número del buffer incorrecto"
 
+#, fuzzy, c-format
+msgid "%sError: buffer not found"
+msgstr "%sError: filtro \"%s\" no encontrado"
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sError: el buffer principal de WeeChat no puede ser cerrado"
@@ -942,20 +946,25 @@ msgstr ""
 msgid "manage buffers"
 msgstr "gestionar los buffers"
 
+#, fuzzy
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || 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> || "
 "unmerge [<número>|-all] || close [<n1>[-<n2>]|<name>] || notify <nivel> || "
 "localvar || set <propiedad> <valor> || get <propiedad> || <número>|<nombre>"
 
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -983,6 +992,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

po/fr.po

@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
-"PO-Revision-Date: 2012-07-27 20:35+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
+"PO-Revision-Date: 2012-07-29 20:00+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -217,6 +217,10 @@ msgstr "  %s[%s%d%s]%s (%s) %s%s%s (notification: %s)"
 msgid "%sError: incorrect buffer number"
 msgstr "%sErreur: numéro de tampon incorrect"
 
+#, c-format
+msgid "%sError: buffer not found"
+msgstr "%sErreur: tampon non trouvé"
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sErreur: le tampon principal de WeeChat ne peut pas être fermé"
@@ -944,19 +948,23 @@ msgid "manage buffers"
 msgstr "gestion des tampons"
 
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || close "
+"[<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> <value> "
+"|| get <property> || <number>|<name>"
 msgstr ""
-"list || clear [<nombre>|<nom>|-merged|-all] || move|merge <nombre> || "
-"unmerge [<nombre>|-all] || close [<n1>[-<n2>]|<nom>] || notify <niveau> || "
-"localvar || set <propriété> <valeur> || get <propriété> || <nombre>|<nom>"
+"list || clear [<nombre>|<nom>|-merged|-all] || move|merge <nombre> || swap "
+"<nombre1>|<nom1> [<nombre2>|<nom2>] || unmerge [<nombre>|-all] || close [<n1>"
+"[-<n2>]|<nom>] || notify <niveau> || localvar || set <propriété> <valeur> || "
+"get <propriété> || <nombre>|<nom>"
 
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -984,6 +992,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"
@@ -1004,6 +1016,8 @@ msgstr ""
 "tampon courant)\n"
 "    move: déplacer le tampon dans la liste (peut être relatif, par exemple "
 "-1)\n"
+"    swap: échanger deux tampons (échanger avec le tampon courant si un seul "
+"numéro/nom donné)\n"
 "   merge: mélanger le tampon courant avec un autre tampon (la zone de "
 "discussion sera un mélange des deux tampons)\n"
 "          (par défaut ctrl-x bascule entre les tampons mélangés)\n"
@@ -1032,6 +1046,10 @@ msgstr ""
 "    /buffer clear\n"
 "  déplacer le tampon vers le numéro 5:\n"
 "    /buffer move 5\n"
+"  échanger le tampon 1 avec le 3:\n"
+"    /buffer swap 1 3\n"
+"  échanger le tampon #weechat avec le tampon courant:\n"
+"    /buffer swap #weechat\n"
 "  mélanger avec le tampon core:\n"
 "    /buffer merge 1\n"
 "  détacher le tampon:\n"

po/hu.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -215,6 +215,10 @@ msgstr "%s%s %s(%s%s%s)%s kilépett"
 msgid "%sError: incorrect buffer number"
 msgstr "%s helytelen pufferszám\n"
 
+#, fuzzy, c-format
+msgid "%sError: buffer not found"
+msgstr "%s a \"%s\" modul nem található\n"
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr ""
@@ -926,9 +930,10 @@ msgid "manage buffers"
 msgstr "pufferek kezelése"
 
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || close "
+"[<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> <value> "
+"|| get <property> || <number>|<name>"
 msgstr ""
 
 #, fuzzy
@@ -937,6 +942,8 @@ msgid ""
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -964,6 +971,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

po/it.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: 2012-07-27 12:15+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -213,6 +213,10 @@ msgstr "  %s[%s%d%s]%s (%s) %s%s%s (notifica: %s)"
 msgid "%sError: incorrect buffer number"
 msgstr "%sErrore: nome buffer non corretto"
 
+#, fuzzy, c-format
+msgid "%sError: buffer not found"
+msgstr "%sErrore: filtro \"%s\" non trovato"
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sErrore: il buffer principale di WeeChat non può essere chiuso"
@@ -933,20 +937,25 @@ msgstr ""
 msgid "manage buffers"
 msgstr "gestione buffer"
 
+#, fuzzy
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || close "
+"[<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> <value> "
+"|| get <property> || <number>|<name>"
 msgstr ""
 "list || clear [<numero>|<nome>|-merged|-all] || move|merge <numero> || "
 "unmerge [<numero>|-all] || close [<n1>[-<n2>]|<nome>] || notify <livello> || "
 "localvar || set <proprietà> <valore> || get <proprietà> || <number>|<nome>"
 
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -974,6 +983,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

po/ja.po

@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: 2012-07-27 12:16+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -212,6 +212,10 @@ msgstr "  %s[%s%d%s]%s (%s) %s%s%s (通知: %s)"
 msgid "%sError: incorrect buffer number"
 msgstr "%sエラー: 不正なバッファ番号"
 
+#, fuzzy, c-format
+msgid "%sError: buffer not found"
+msgstr "%sエラー: フィルタ \"%s\" が見つかりません"
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sエラー: WeeChat メインバッファを閉じることはできません。"
@@ -924,20 +928,25 @@ msgstr ""
 msgid "manage buffers"
 msgstr "バッファを管理"
 
+#, fuzzy
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || close "
+"[<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> <value> "
+"|| get <property> || <number>|<name>"
 msgstr ""
 "list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
 "unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
 "localvar || set <property> <value> || get <property> || <number>|<name>"
 
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -965,6 +974,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

po/pl.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: 2012-07-27 12:16+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -216,6 +216,10 @@ msgstr "  %s[%s%d%s]%s (%s) %s%s%s (powiadomienia: %s)"
 msgid "%sError: incorrect buffer number"
 msgstr "%sBłąd: nieprawidłowy numer buforu"
 
+#, fuzzy, c-format
+msgid "%sError: buffer not found"
+msgstr "%sBłąd: nie odnaleziono filtru \"%s\""
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sBłąd: główny bufor WeeChat nie może zostać zamknięty"
@@ -947,20 +951,25 @@ msgstr ""
 msgid "manage buffers"
 msgstr "zarządzaj buforami"
 
+#, fuzzy
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || close "
+"[<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> <value> "
+"|| get <property> || <number>|<name>"
 msgstr ""
 "list || clear [<numer>|<nazwa>|-merged|-all] || move|merge <numer> || "
 "unmerge [<numer>|-all] || close [<n1>[-<n2>]|<nazwa>] || notify <poziom> || "
 "localvar || set <właściwość> <wartość> || get <właściwość> || <numer>|<nazwa>"
 
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -988,6 +997,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

po/pt_BR.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -238,6 +238,10 @@ msgstr "  %s[%s%d%s]%s (%s) %s%s%s (notificar: %s)"
 msgid "%sError: incorrect buffer number"
 msgstr "%sErro: número do buffer incorreto"
 
+#, fuzzy, c-format
+msgid "%sError: buffer not found"
+msgstr "%sErro: filtro \"%s\" não encontrado"
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sErro: o buffer principal do WeeChat não pode ser fechado"
@@ -976,21 +980,26 @@ msgstr ""
 msgid "manage buffers"
 msgstr "gerenciar buffers"
 
+#, fuzzy
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || 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> || "
 "unmerge [<número>|-all] || close [<n1>[-<n2>]|<nome>] || notify <nível> || "
 "localvar || set <propriedade> <valor> || get <propriedade> || <número>|<nome>"
 
 # must find a better translation to "hotlist"
+#, fuzzy
 msgid ""
 "    list: list buffers (without argument, this list is displayed)\n"
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -1018,6 +1027,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

po/ru.po

@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.9-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: 2012-06-03 09:49+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -219,6 +219,10 @@ msgstr "%s%s %s(%s%s%s)%s вышел"
 msgid "%sError: incorrect buffer number"
 msgstr "%s неправильный номер буфера\n"
 
+#, fuzzy, c-format
+msgid "%sError: buffer not found"
+msgstr "%s plugin \"%s\" не найден\n"
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr "%sОшибка: нельзя закрыть основной буфер WeeChat"
@@ -943,9 +947,10 @@ msgid "manage buffers"
 msgstr "управление буферами"
 
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || close "
+"[<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> <value> "
+"|| get <property> || <number>|<name>"
 msgstr ""
 
 #, fuzzy
@@ -954,6 +959,8 @@ msgid ""
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -981,6 +988,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

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: 2012-07-27 20:33+0200\n"
+"POT-Creation-Date: 2012-07-29 20:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -177,6 +177,10 @@ msgstr ""
 msgid "%sError: incorrect buffer number"
 msgstr ""
 
+#, c-format
+msgid "%sError: buffer not found"
+msgstr ""
+
 #, c-format
 msgid "%sError: WeeChat main buffer can't be closed"
 msgstr ""
@@ -824,9 +828,10 @@ msgid "manage buffers"
 msgstr ""
 
 msgid ""
-"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || "
-"unmerge [<number>|-all] || close [<n1>[-<n2>]|<name>] || notify <level> || "
-"localvar || set <property> <value> || get <property> || <number>|<name>"
+"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap "
+"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || close "
+"[<n1>[-<n2>]|<name>] || notify <level> || localvar || set <property> <value> "
+"|| get <property> || <number>|<name>"
 msgstr ""
 
 msgid ""
@@ -834,6 +839,8 @@ msgid ""
 "   clear: clear buffer content (number for a buffer, -merged for merged "
 "buffers, -all for all buffers, or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"    swap: swap two buffers (swap with current buffer if only one number/name "
+"given)\n"
 "   merge: merge current buffer to another buffer (chat area will be mix of "
 "both buffers)\n"
 "          (by default ctrl-x switches between merged buffers)\n"
@@ -861,6 +868,10 @@ msgid ""
 "    /buffer clear\n"
 "  move buffer to number 5:\n"
 "    /buffer move 5\n"
+"  swap buffer 1 with 3:\n"
+"    /buffer swap 1 3\n"
+"  swap buffer #weechat with current buffer:\n"
+"    /buffer swap #weechat\n"
 "  merge with core buffer:\n"
 "    /buffer merge 1\n"
 "  unmerge buffer:\n"

src/core/wee-command.c

@@ -501,7 +501,7 @@ command_buffer_display_localvar (void *data,
 
 COMMAND_CALLBACK(buffer)
 {
-    struct t_gui_buffer *ptr_buffer, *weechat_buffer;
+    struct t_gui_buffer *ptr_buffer, *ptr_buffer2, *weechat_buffer;
     long number, number1, number2;
     char *error, *value, *pos, *str_number1, *pos_number2;
     int i, target_buffer, error_main_buffer, num_buffers;
@@ -622,6 +622,55 @@ COMMAND_CALLBACK(buffer)
         return WEECHAT_RC_OK;
     }
 
+    /* swap buffers */
+    if (string_strcasecmp (argv[1], "swap") == 0)
+    {
+        COMMAND_MIN_ARGS(3, "buffer swap");
+
+        ptr_buffer = NULL;
+        ptr_buffer2 = NULL;
+
+        /* first buffer for swap */
+        number = strtol (argv[2], &error, 10);
+        if (error && !error[0])
+            ptr_buffer = gui_buffer_search_by_number (number);
+        else
+        {
+            ptr_buffer = gui_buffer_search_by_full_name (argv[2]);
+            if (!ptr_buffer)
+                ptr_buffer = gui_buffer_search_by_partial_name (NULL, argv[2]);
+        }
+
+        /* second buffer for swap */
+        if (argc > 3)
+        {
+            number = strtol (argv[3], &error, 10);
+            if (error && !error[0])
+                ptr_buffer2 = gui_buffer_search_by_number (number);
+            else
+            {
+                ptr_buffer2 = gui_buffer_search_by_full_name (argv[3]);
+                if (!ptr_buffer2)
+                    ptr_buffer2 = gui_buffer_search_by_partial_name (NULL, argv[3]);
+            }
+        }
+        else
+            ptr_buffer2 = buffer;
+
+        if (!ptr_buffer || !ptr_buffer2)
+        {
+            /* invalid buffer name/number */
+            gui_chat_printf (NULL,
+                             _("%sError: buffer not found"),
+                             gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]);
+            return WEECHAT_RC_OK;
+        }
+
+        gui_buffer_swap (ptr_buffer, ptr_buffer2);
+
+        return WEECHAT_RC_OK;
+    }
+
     /* merge buffer with another number in the list */
     if (string_strcasecmp (argv[1], "merge") == 0)
     {
@@ -5439,6 +5488,7 @@ command_init ()
                   N_("list"
                      " || clear [<number>|<name>|-merged|-all]"
                      " || move|merge <number>"
+                     " || swap <number1>|<name1> [<number2>|<name2>]"
                      " || unmerge [<number>|-all]"
                      " || close [<n1>[-<n2>]|<name>]"
                      " || notify <level>"
@@ -5453,6 +5503,8 @@ command_init ()
                      "nothing for current buffer)\n"
                      "    move: move buffer in the list (may be relative, for "
                      "example -1)\n"
+                     "    swap: swap two buffers (swap with current buffer if "
+                     "only one number/name given)\n"
                      "   merge: merge current buffer to another buffer (chat "
                      "area will be mix of both buffers)\n"
                      "          (by default ctrl-x switches between merged "
@@ -5482,6 +5534,10 @@ command_init ()
                      "    /buffer clear\n"
                      "  move buffer to number 5:\n"
                      "    /buffer move 5\n"
+                     "  swap buffer 1 with 3:\n"
+                     "    /buffer swap 1 3\n"
+                     "  swap buffer #weechat with current buffer:\n"
+                     "    /buffer swap #weechat\n"
                      "  merge with core buffer:\n"
                      "    /buffer merge 1\n"
                      "  unmerge buffer:\n"
@@ -5496,6 +5552,7 @@ command_init ()
                      "    /buffer +1"),
                   "clear -merged|-all|%(buffers_numbers)|%(buffers_plugins_names)"
                   " || move %(buffers_numbers)"
+                  " || swap %(buffers_numbers)"
                   " || merge %(buffers_numbers)"
                   " || unmerge %(buffers_numbers)|-all"
                   " || close %(buffers_plugins_names)"

src/gui/gui-buffer.c

@@ -2494,6 +2494,37 @@ gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number)
                       WEECHAT_HOOK_SIGNAL_POINTER, buffer);
 }
 
+/*
+ * gui_buffer_swap: swap two buffers
+ */
+
+void
+gui_buffer_swap (struct t_gui_buffer *buffer1, struct t_gui_buffer *buffer2)
+{
+    struct t_gui_buffer *ptr_buffer1, *ptr_buffer2;
+    int number1, number2;
+
+    if (!buffer1 || !buffer2)
+        return;
+
+    /* store pointers and numbers, with number1 < number2 */
+    ptr_buffer1 = (buffer1->number < buffer2->number) ? buffer1 : buffer2;
+    ptr_buffer2 = (buffer1->number < buffer2->number) ? buffer2 : buffer1;
+    number1 = ptr_buffer1->number;
+    number2 = ptr_buffer2->number;
+
+    /* swap buffer with itself? nothing to do! */
+    if (number1 == number2)
+        return;
+
+    /* move number2 before number1 */
+    gui_buffer_move_to_number (ptr_buffer2, number1);
+
+    /* move number1 before number2 */
+    if (number2 > number1 + 1)
+        gui_buffer_move_to_number (ptr_buffer1, number2);
+}
+
 /*
  * gui_buffer_merge: merge a buffer to another buffer
  */

src/gui/gui-buffer.h

@@ -279,6 +279,8 @@ extern void gui_buffer_set_active_buffer (struct t_gui_buffer *buffer);
 extern struct t_gui_buffer *gui_buffer_get_next_active_buffer (struct t_gui_buffer *buffer);
 extern struct t_gui_buffer *gui_buffer_get_previous_active_buffer (struct t_gui_buffer *buffer);
 extern void gui_buffer_move_to_number (struct t_gui_buffer *buffer, int number);
+extern void gui_buffer_swap (struct t_gui_buffer *buffer1,
+                             struct t_gui_buffer *buffer2);
 extern void gui_buffer_merge (struct t_gui_buffer *buffer,
                               struct t_gui_buffer *target_buffer);
 extern void gui_buffer_unmerge (struct t_gui_buffer *buffer, int number);