core: fix bugs with automatic layout (bug #26110), add support of merged buffers in layout (task #10893)

7 files changed, 8 insertions, 4 deletions

diff --git a/doc/de/autogen/plugin_api/hdata.txt b/doc/de/autogen/plugin_api/hdata.txt
index d4560a5ff..fdb152b2c 100644
--- a/doc/de/autogen/plugin_api/hdata.txt
+++ b/doc/de/autogen/plugin_api/hdata.txt
@@ -225,7 +225,7 @@
   'merge_for_upgrade' (pointer) +
   'number' (integer) +
   'layout_number' (integer) +
-  'layout_applied' (integer) +
+  'layout_number_merge_order' (integer) +
   'name' (string) +
   'short_name' (string) +
   'type' (integer) +
diff --git a/doc/en/autogen/plugin_api/hdata.txt b/doc/en/autogen/plugin_api/hdata.txt
index 61bd9ff35..c252dcbac 100644
--- a/doc/en/autogen/plugin_api/hdata.txt
+++ b/doc/en/autogen/plugin_api/hdata.txt
@@ -225,7 +225,7 @@
   'merge_for_upgrade' (pointer) +
   'number' (integer) +
   'layout_number' (integer) +
-  'layout_applied' (integer) +
+  'layout_number_merge_order' (integer) +
   'name' (string) +
   'short_name' (string) +
   'type' (integer) +
diff --git a/doc/en/weechat_plugin_api.en.txt b/doc/en/weechat_plugin_api.en.txt
index f51fb13a5..4c0b1f2db 100644
--- a/doc/en/weechat_plugin_api.en.txt
+++ b/doc/en/weechat_plugin_api.en.txt
@@ -8802,6 +8802,7 @@ Arguments:
 * 'property': property name:
 ** 'number': number of buffer (starts to 1)
 ** 'layout_number': number of buffer saved in layout
+** 'layout_number_merge_order': order in merge for layout
 ** 'type': buffer type (0: formatted, 1: free content)
 ** 'notify': notify level for buffer
 ** 'num_displayed': number of windows displaying buffer
diff --git a/doc/fr/autogen/plugin_api/hdata.txt b/doc/fr/autogen/plugin_api/hdata.txt
index 0eecffe6e..92c868306 100644
--- a/doc/fr/autogen/plugin_api/hdata.txt
+++ b/doc/fr/autogen/plugin_api/hdata.txt
@@ -225,7 +225,7 @@
   'merge_for_upgrade' (pointer) +
   'number' (integer) +
   'layout_number' (integer) +
-  'layout_applied' (integer) +
+  'layout_number_merge_order' (integer) +
   'name' (string) +
   'short_name' (string) +
   'type' (integer) +
diff --git a/doc/fr/weechat_plugin_api.fr.txt b/doc/fr/weechat_plugin_api.fr.txt
index 1353725d9..48d7f336f 100644
--- a/doc/fr/weechat_plugin_api.fr.txt
+++ b/doc/fr/weechat_plugin_api.fr.txt
@@ -8943,6 +8943,7 @@ Paramètres :
 * 'property' : nom de la propriété :
 ** 'number' : numéro du tampon (commence à 1)
 ** 'layout_number' : numéro du tampon sauvegardé dans le "layout"
+** 'layout_number_merge_order' : ordre du tampon mélangé pour le "layout"
 ** 'type' : type de tampon (0 : formaté, 1 : contenu libre)
 ** 'notify' : niveau de notification du tampon
 ** 'num_displayed' : nombre de fenêtres affichant ce tampon
diff --git a/doc/it/autogen/plugin_api/hdata.txt b/doc/it/autogen/plugin_api/hdata.txt
index c0e0446e2..dcef2f337 100644
--- a/doc/it/autogen/plugin_api/hdata.txt
+++ b/doc/it/autogen/plugin_api/hdata.txt
@@ -225,7 +225,7 @@
   'merge_for_upgrade' (pointer) +
   'number' (integer) +
   'layout_number' (integer) +
-  'layout_applied' (integer) +
+  'layout_number_merge_order' (integer) +
   'name' (string) +
   'short_name' (string) +
   'type' (integer) +
diff --git a/doc/it/weechat_plugin_api.it.txt b/doc/it/weechat_plugin_api.it.txt
index 22c3841cc..ae03a1d14 100644
--- a/doc/it/weechat_plugin_api.it.txt
+++ b/doc/it/weechat_plugin_api.it.txt
@@ -8863,6 +8863,8 @@ Argomenti:
 * 'property': nome della proprietà:
 ** 'number': numero del buffer (inizia da 1)
 ** 'layout_number': numero del buffer salvato nel layout
+// TRANSLATION MISSING
+** 'layout_number_merge_order': order in merge for layout
 ** 'type': tipo dibuffer (0: formattato, 1: contenuto libero)
 ** 'notify': livello di notifica per il buffer
 ** 'num_displayed': numero delle finestre che visualizzano il buffer