core: add option weechat.look.chat_space_right (issue #1862)

25 files changed, 145 insertions, 16 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 9f0bc1188..a8d75c5ca 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -20,6 +20,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 
 New features::
 
+  * core: add option weechat.look.chat_space_right (issue #1862)
   * core: allow value "0" in buffer property "unread" to remove read marker from buffer
   * core: add command `/allbuf`
   * core: add command `/hotlist`
diff --git a/doc/de/includes/autogen_user_options.de.adoc b/doc/de/includes/autogen_user_options.de.adoc
index 0c4e9566c..c9348d115 100644
--- a/doc/de/includes/autogen_user_options.de.adoc
+++ b/doc/de/includes/autogen_user_options.de.adoc
@@ -630,6 +630,12 @@
 ** Werte: beliebige Zeichenkette
 ** Standardwert: `+""+`
 
+* [[option_weechat.look.chat_space_right]] *weechat.look.chat_space_right*
+** Beschreibung: pass:none[keep a space on the right side of chat area if there is a bar displayed on the right (for both text and read marker)]
+** Typ: boolesch
+** Werte: on, off
+** Standardwert: `+off+`
+
 * [[option_weechat.look.color_basic_force_bold]] *weechat.look.color_basic_force_bold*
 ** Beschreibung: pass:none[erzwingt das Textattribut "fett" für helle Farben und "darkgray", um diese Farben stärker hervorzuheben (diese Einstellung ist standardmäßig deaktiviert: "fett" findet ausschließlich dann Verwendung falls das Terminal weniger als 16 Farben zur Verfügung stellt)]
 ** Typ: boolesch
diff --git a/doc/en/includes/autogen_user_options.en.adoc b/doc/en/includes/autogen_user_options.en.adoc
index 87ee15604..d968e8e97 100644
--- a/doc/en/includes/autogen_user_options.en.adoc
+++ b/doc/en/includes/autogen_user_options.en.adoc
@@ -630,6 +630,12 @@
 ** values: any string
 ** default value: `+""+`
 
+* [[option_weechat.look.chat_space_right]] *weechat.look.chat_space_right*
+** description: pass:none[keep a space on the right side of chat area if there is a bar displayed on the right (for both text and read marker)]
+** type: boolean
+** values: on, off
+** default value: `+off+`
+
 * [[option_weechat.look.color_basic_force_bold]] *weechat.look.color_basic_force_bold*
 ** description: pass:none[force "bold" attribute for light colors and "darkgray" in basic colors (this option is disabled by default: bold is used only if terminal has less than 16 colors)]
 ** type: boolean
diff --git a/doc/fr/includes/autogen_user_options.fr.adoc b/doc/fr/includes/autogen_user_options.fr.adoc
index abd28286b..5edbb18e7 100644
--- a/doc/fr/includes/autogen_user_options.fr.adoc
+++ b/doc/fr/includes/autogen_user_options.fr.adoc
@@ -630,6 +630,12 @@
 ** valeurs: toute chaîne
 ** valeur par défaut: `+""+`
 
+* [[option_weechat.look.chat_space_right]] *weechat.look.chat_space_right*
+** description: pass:none[garder un espace sur la droite de la zone de discussion s'il y a une barre affichée sur la droite (pour le texte et le marqueur de données non lues)]
+** type: booléen
+** valeurs: on, off
+** valeur par défaut: `+off+`
+
 * [[option_weechat.look.color_basic_force_bold]] *weechat.look.color_basic_force_bold*
 ** description: pass:none[forcer l'attribut "bold" (gras) pour les couleurs claires et "darkgray" dans les couleurs de base (cette option est désactivée par défaut : le gras est utilisé seulement si le terminal a moins de 16 couleurs)]
 ** type: booléen
diff --git a/doc/it/includes/autogen_user_options.it.adoc b/doc/it/includes/autogen_user_options.it.adoc
index d34a3a9b6..05fa02fa3 100644
--- a/doc/it/includes/autogen_user_options.it.adoc
+++ b/doc/it/includes/autogen_user_options.it.adoc
@@ -630,6 +630,12 @@
 ** valori: qualsiasi stringa
 ** valore predefinito: `+""+`
 
+* [[option_weechat.look.chat_space_right]] *weechat.look.chat_space_right*
+** descrizione: pass:none[keep a space on the right side of chat area if there is a bar displayed on the right (for both text and read marker)]
+** tipo: bool
+** valori: on, off
+** valore predefinito: `+off+`
+
 * [[option_weechat.look.color_basic_force_bold]] *weechat.look.color_basic_force_bold*
 ** descrizione: pass:none[forza l'attributo "bold" per i colori chiari e "darkgray" nei colori di base (questa opzione è disabilitata per default: il grassetto è usato solo se il terminale ha meno di 16 colori)]
 ** tipo: bool
diff --git a/doc/ja/includes/autogen_user_options.ja.adoc b/doc/ja/includes/autogen_user_options.ja.adoc
index 5d007cf0e..413241fe4 100644
--- a/doc/ja/includes/autogen_user_options.ja.adoc
+++ b/doc/ja/includes/autogen_user_options.ja.adoc
@@ -630,6 +630,12 @@
 ** 値: 未制約文字列
 ** デフォルト値: `+""+`
 
+* [[option_weechat.look.chat_space_right]] *weechat.look.chat_space_right*
+** 説明: pass:none[keep a space on the right side of chat area if there is a bar displayed on the right (for both text and read marker)]
+** タイプ: ブール
+** 値: on, off
+** デフォルト値: `+off+`
+
 * [[option_weechat.look.color_basic_force_bold]] *weechat.look.color_basic_force_bold*
 ** 説明: pass:none[明るい色と標準的な色の "darkgray" には "太字" 属性を強制 (このオプションはデフォルトでは無効: 太字は端末が 16 色以下の表示能力しかない場合に利用される)]
 ** タイプ: ブール
diff --git a/doc/pl/includes/autogen_user_options.pl.adoc b/doc/pl/includes/autogen_user_options.pl.adoc
index b73fbd28a..cf9f9ddae 100644
--- a/doc/pl/includes/autogen_user_options.pl.adoc
+++ b/doc/pl/includes/autogen_user_options.pl.adoc
@@ -630,6 +630,12 @@
 ** wartości: dowolny ciąg
 ** domyślna wartość: `+""+`
 
+* [[option_weechat.look.chat_space_right]] *weechat.look.chat_space_right*
+** opis: pass:none[keep a space on the right side of chat area if there is a bar displayed on the right (for both text and read marker)]
+** typ: bool
+** wartości: on, off
+** domyślna wartość: `+off+`
+
 * [[option_weechat.look.color_basic_force_bold]] *weechat.look.color_basic_force_bold*
 ** opis: pass:none[wymusza atrybut "bold" dla jasnych kolorów oraz "darkgray" w kolorach podstawowych (ta opcja jest domyślnie wyłączona: pogrubienie jest używane tylko jeśli terminal obsługuje poniżej 16 kolorów)]
 ** typ: bool
diff --git a/doc/sr/includes/autogen_user_options.sr.adoc b/doc/sr/includes/autogen_user_options.sr.adoc
index 50018e21d..a15762e53 100644
--- a/doc/sr/includes/autogen_user_options.sr.adoc
+++ b/doc/sr/includes/autogen_user_options.sr.adoc
@@ -630,6 +630,12 @@
 ** вредности: било који стринг
 ** подразумевана вредност: `+""+`
 
+* [[option_weechat.look.chat_space_right]] *weechat.look.chat_space_right*
+** опис: pass:none[keep a space on the right side of chat area if there is a bar displayed on the right (for both text and read marker)]
+** тип: логичка
+** вредности: on, off
+** подразумевана вредност: `+off+`
+
 * [[option_weechat.look.color_basic_force_bold]] *weechat.look.color_basic_force_bold*
 ** опис: pass:none[форсира атрибут „подебљано” за светле боје и „darkgray” у основним бојама (ова опција је подразумевано искључена: подебљано се користи само ако терминал подржава мање од 16 боја)]
 ** тип: логичка
diff --git a/po/cs.po b/po/cs.po
index 90f00825a..efba8cd0a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3273,6 +3273,11 @@ msgstr ""
 "data/času)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/de.po b/po/de.po
index 92a04de73..4de362c2c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -26,7 +26,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-12-28 10:25+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German - Germany <weechatter@arcor.de>\n"
@@ -4165,6 +4165,11 @@ msgstr ""
 "dem Format \"${color:xxx}\" angegeben werden, siehe /help eval)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/es.po b/po/es.po
index b1b78cc4b..3081846d6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Santiago Forero <santiago@forero.xyz>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3767,6 +3767,11 @@ msgstr ""
 "(mostrar prefijo)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/fr.po b/po/fr.po
index 2b3b21ad0..7d54c9a3e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
-"PO-Revision-Date: 2022-12-25 22:36+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
+"PO-Revision-Date: 2022-12-29 11:58+0100\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -4060,6 +4060,13 @@ msgstr ""
 "eval)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+"garder un espace sur la droite de la zone de discussion s'il y a une barre "
+"affichée sur la droite (pour le texte et le marqueur de données non lues)"
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/hu.po b/po/hu.po
index 592b9923b..ace65f486 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2930,6 +2930,11 @@ msgid ""
 msgstr "új nap kezdetével megjelenő időbélyeg"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/it.po b/po/it.po
index 4679d9ec1..c9da3aebe 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3448,6 +3448,11 @@ msgstr ""
 "disabilitare questa funzionalità (mostra prefisso)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/ja.po b/po/ja.po
index db491620f..b33770998 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -3894,6 +3894,11 @@ msgstr ""
 "ため、${color:xxx} などを使えます、/help eval を参照してください)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/pl.po b/po/pl.po
index c2de3c3c8..a65436987 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -4301,6 +4301,11 @@ msgstr ""
 "eval)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/pt.po b/po/pt.po
index 797d70a53..5a903438c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -3889,6 +3889,11 @@ msgstr ""
 "prefixo)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6432001d2..60bd8045e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Érico Nogueira <ericonr@disroot.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -3510,6 +3510,11 @@ msgstr ""
 "especificadores de data/tempo)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/ru.po b/po/ru.po
index 263ea1777..55e4c6405 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2952,6 +2952,11 @@ msgid ""
 msgstr "отображение маркера даты при смене дня"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/sr.po b/po/sr.po
index 32e472d26..1ae2de399 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-12-05 09:44+0400\n"
 "Last-Translator: Ivan Pešić <ivan.pesic@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4173,6 +4173,11 @@ msgstr ""
 "да користите у боје „${color:xxx}”, погледајте /help eval)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/tr.po b/po/tr.po
index f1e715496..f36b07c34 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\n"
 "PO-Revision-Date: 2022-10-15 22:51+0200\n"
 "Last-Translator: Emir SARI <emir_sari@icloud.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -4282,6 +4282,11 @@ msgstr ""
 "kullanabilirsiniz, örn. \"${color:xxx}\"; bkz. /help eval)"
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/po/weechat.pot b/po/weechat.pot
index 34fd027c2..ed1b8eaa1 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2022-12-25 22:34+0100\n"
+"POT-Creation-Date: 2022-12-29 11:51+0100\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"
@@ -2685,6 +2685,11 @@ msgid ""
 msgstr ""
 
 msgid ""
+"keep a space on the right side of chat area if there is a bar displayed on "
+"the right (for both text and read marker)"
+msgstr ""
+
+msgid ""
 "force \"bold\" attribute for light colors and \"darkgray\" in basic colors "
 "(this option is disabled by default: bold is used only if terminal has less "
 "than 16 colors)"
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index f84c49626..f2613afad 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -101,6 +101,7 @@ struct t_config_option *config_look_buffer_search_regex;
 struct t_config_option *config_look_buffer_search_where;
 struct t_config_option *config_look_buffer_time_format;
 struct t_config_option *config_look_buffer_time_same;
+struct t_config_option *config_look_chat_space_right;
 struct t_config_option *config_look_color_basic_force_bold;
 struct t_config_option *config_look_color_inactive_buffer;
 struct t_config_option *config_look_color_inactive_message;
@@ -2885,6 +2886,13 @@ config_weechat_init_options ()
         NULL, NULL, NULL,
         &config_change_buffer_time_same, NULL, NULL,
         NULL, NULL, NULL);
+    config_look_chat_space_right = config_file_new_option (
+        weechat_config_file, ptr_section,
+        "chat_space_right", "boolean",
+        N_("keep a space on the right side of chat area if there is a bar "
+           "displayed on the right (for both text and read marker)"),
+        NULL, 0, 0, "off", NULL, 0,
+        NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
     config_look_color_basic_force_bold = config_file_new_option (
         weechat_config_file, ptr_section,
         "color_basic_force_bold", "boolean",
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index 38017e294..a2efad374 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -153,6 +153,7 @@ extern struct t_config_option *config_look_buffer_search_regex;
 extern struct t_config_option *config_look_buffer_search_where;
 extern struct t_config_option *config_look_buffer_time_format;
 extern struct t_config_option *config_look_buffer_time_same;
+extern struct t_config_option *config_look_chat_space_right;
 extern struct t_config_option *config_look_color_basic_force_bold;
 extern struct t_config_option *config_look_color_inactive_buffer;
 extern struct t_config_option *config_look_color_inactive_message;
diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c
index 40bc38577..0e41b3ac5 100644
--- a/src/gui/curses/gui-curses-chat.c
+++ b/src/gui/curses/gui-curses-chat.c
@@ -56,11 +56,16 @@
 int
 gui_chat_get_real_width (struct t_gui_window *window)
 {
-    if ((window->win_chat_width > 1)
+    if (CONFIG_BOOLEAN(config_look_chat_space_right)
+        && (window->win_chat_width > 1)
         && (window->win_chat_x + window->win_chat_width < gui_window_get_width ()))
+    {
         return window->win_chat_width - 1;
+    }
     else
+    {
         return window->win_chat_width;
+    }
 }
 
 /*