core: don't execute command scheduled by /wait if the buffer does not exist any more

22 files changed, 114 insertions, 119 deletions

diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index 1b34078ae..06b8df9cd 100644
--- a/ChangeLog.adoc
+++ b/ChangeLog.adoc
@@ -32,6 +32,7 @@ New features::
 
 Bug fixes::
 
+  * core: don't execute command scheduled by /wait if the buffer does not exist any more
   * core: set max length to 4096 for /secure passphrase (issue #1323)
   * core: refilter only affected buffers on filter change (issue #1309, issue #1311)
   * fset: fix slow refresh of fset buffer during /reload (issue #1313)
diff --git a/doc/de/autogen/user/weechat_commands.adoc b/doc/de/autogen/user/weechat_commands.adoc
index b5512f7e6..e6e79ec79 100644
--- a/doc/de/autogen/user/weechat_commands.adoc
+++ b/doc/de/autogen/user/weechat_commands.adoc
@@ -944,23 +944,23 @@ Um diesen Befehl in jedem Buffer ausführen zu können, kann der Standardkurzbef
 ----
 /wait  <number>[<unit>] <command>
 
- number: die Zeit, die gewartet werden soll (dies muss eine natürlich Zahl sein)
-   unit: mögliche Werte (optional):
-           ms: Millisekunden
-            s: Sekunden (Vorgabewert)
-            m: Minuten
-            h: Stunden
-command: Befehl der ausgeführt werden soll (ohne das führende '/') oder ein Text der in dem Buffer ausgegeben werden soll
+ number: amount of time to wait (integer number)
+   unit: optional, values are:
+           ms: milliseconds
+            s: seconds (default)
+            m: minutes
+            h: hours
+command: command to execute (or text to send to buffer if command does not start with '/')
 
-Hinweis: Der Befehl der zeitverzögert gestartet werden soll wird im selben Buffer ausgeführt in dem auch der /wait Befehl aufgerufen wurde. Falls der Buffer nicht gefunden werden kann, da er in der Zwischenzeit zum Beispiel geschlossen wurde, wird der Befehl im WeeChat Core-Buffer ausgeführt.
+Note: the command is executed on buffer where /wait was executed (if the buffer does not exist any more, the command is not executed).
 
-Beispiele:
-  Betritt nach 10 Sekunden den Channel #test:
-  /wait 10 /join #test
-  Setzt nach 15 Minuten eine globale Abwesenheit:
-  /wait 15m /away -all Bin dann mal eben weg
-  Versendet nach zwei Minuten den Text 'Hallo':
-  /wait 2m Hallo
+Examples:
+  join channel in 10 seconds:
+    /wait 10 /join #test
+  set away in 15 minutes:
+    /wait 15m /away -all I'm away
+  say 'hello' in 2 minutes:
+    /wait 2m hello
 ----
 
 [[command_weechat_window]]
diff --git a/doc/en/autogen/user/weechat_commands.adoc b/doc/en/autogen/user/weechat_commands.adoc
index dc5bde05e..b3ce0491d 100644
--- a/doc/en/autogen/user/weechat_commands.adoc
+++ b/doc/en/autogen/user/weechat_commands.adoc
@@ -952,7 +952,7 @@ The default alias /v can be used to execute this command on all buffers (otherwi
             h: hours
 command: command to execute (or text to send to buffer if command does not start with '/')
 
-Note: command is executed on buffer where /wait was executed (if buffer is not found (for example if it has been closed before execution of command), then command is executed on WeeChat core buffer).
+Note: the command is executed on buffer where /wait was executed (if the buffer does not exist any more, the command is not executed).
 
 Examples:
   join channel in 10 seconds:
diff --git a/doc/fr/autogen/user/weechat_commands.adoc b/doc/fr/autogen/user/weechat_commands.adoc
index 6ffd92c6a..c8bd2ef8a 100644
--- a/doc/fr/autogen/user/weechat_commands.adoc
+++ b/doc/fr/autogen/user/weechat_commands.adoc
@@ -952,7 +952,7 @@ L'alias par défaut /v peut être utilisé pour exécuter cette commande sur tou
               h : heures
 commande : commande à exécuter (ou texte à envoyer au tampon si la commande ne commence pas par '/')
 
-Note : la commande est exécutée sur le tampon où /wait a été exécuté (si le tampon n'est pas trouvé, alors la commande est exécutée sur le tampon WeeChat principal).
+Note : la commande est exécutée sur le tampon où /wait a été exécuté (si le tampon n'existe plus, la commande n'est pas exécutée).
 
 Exemples :
   rejoindre le canal dans 10 secondes :
diff --git a/doc/it/autogen/user/weechat_commands.adoc b/doc/it/autogen/user/weechat_commands.adoc
index f32eedf29..591f48a6f 100644
--- a/doc/it/autogen/user/weechat_commands.adoc
+++ b/doc/it/autogen/user/weechat_commands.adoc
@@ -944,23 +944,23 @@ The default alias /v can be used to execute this command on all buffers (otherwi
 ----
 /wait  <numero>[<unità>] <comando>
 
- numero: tempo di attesa (numero intero)
-  unità: valori opzionali sono:
-           ms: millisecondi
-            s: secondi (predefinito)
-            m: minuti
-            h: ore
-comando: comando da eseguire (o testo da inviare al buffer se il comando non inizia con '/')
+ number: amount of time to wait (integer number)
+   unit: optional, values are:
+           ms: milliseconds
+            s: seconds (default)
+            m: minutes
+            h: hours
+command: command to execute (or text to send to buffer if command does not start with '/')
 
-Nota: il comando viene eseguito sui buffer dove /wait è stato eseguito (se il buffer non viene trovato (per esempio se è stato chiuso prima dell'esecuzione), allora il comando verrà eseguito sul buffer core di WeeChat)
+Note: the command is executed on buffer where /wait was executed (if the buffer does not exist any more, the command is not executed).
 
-Esempi:
-  entra nel canale tra 10 secondi:
+Examples:
+  join channel in 10 seconds:
     /wait 10 /join #test
-  imposta assenza tra 15 minuti:
-    /wait 15m /away -all Sono assente
-  scrive 'ciao' tra 2 minuti:
-    /wait 2m ciao
+  set away in 15 minutes:
+    /wait 15m /away -all I'm away
+  say 'hello' in 2 minutes:
+    /wait 2m hello
 ----
 
 [[command_weechat_window]]
diff --git a/doc/ja/autogen/user/weechat_commands.adoc b/doc/ja/autogen/user/weechat_commands.adoc
index 5ac4e4313..caf79e098 100644
--- a/doc/ja/autogen/user/weechat_commands.adoc
+++ b/doc/ja/autogen/user/weechat_commands.adoc
@@ -944,22 +944,22 @@ path_to_binary: WeeChat バイナリへのパス (デフォルトは現在のバ
 ----
 /wait  <number>[<unit>] <command>
 
- number: 遅延時間 (整数)
-   unit: 任意、値は:
-           ms: ミリ秒
-            s: 秒 (デフォルト)
-            m: 分
-            h: 時
-command: 実行するコマンド (コマンドが '/' で始まらない場合はバッファに送信するテキスト)
+ number: amount of time to wait (integer number)
+   unit: optional, values are:
+           ms: milliseconds
+            s: seconds (default)
+            m: minutes
+            h: hours
+command: command to execute (or text to send to buffer if command does not start with '/')
 
-注意: コマンドは /wait が実行されたバッファで実行されます (バッファが見つからない場合 (例えばコマンド実行前にバッファが閉じられた場合) は、コマンドは WeeChat コアバッファで実行されます)。
+Note: the command is executed on buffer where /wait was executed (if the buffer does not exist any more, the command is not executed).
 
-例:
-  10 秒後にチャンネルに入る:
+Examples:
+  join channel in 10 seconds:
     /wait 10 /join #test
-  15 分後に離席状態に変更:
+  set away in 15 minutes:
     /wait 15m /away -all I'm away
-  2 分後に 'hello' と発言:
+  say 'hello' in 2 minutes:
     /wait 2m hello
 ----
 
diff --git a/doc/pl/autogen/user/weechat_commands.adoc b/doc/pl/autogen/user/weechat_commands.adoc
index f05f84b0b..ff5b1d244 100644
--- a/doc/pl/autogen/user/weechat_commands.adoc
+++ b/doc/pl/autogen/user/weechat_commands.adoc
@@ -944,22 +944,22 @@ Domyślny alias /v może zostać użyty do wykonania tej komendy we wszystkich b
 ----
 /wait  <liczba>[<jednostka>] <komenda>
 
- liczba: ilość czasu do odczekania (liczba całkowita)
-   jednostka: opcjonalnie, możliwe wartości:
-           ms: milisekundy
-            s: sekundy (domyślnie)
-            m: minuty
-            h: godziny
-komenda: komenda do wykonania (lub tekst do wysłania do bufora jeżeli komenda nie zaczyna się od  '/')
+ number: amount of time to wait (integer number)
+   unit: optional, values are:
+           ms: milliseconds
+            s: seconds (default)
+            m: minutes
+            h: hours
+command: command to execute (or text to send to buffer if command does not start with '/')
 
-Ważne: komenda zostanie wykonana w buforze, gdzie zostało wykonane /wait (jeśli bufor nie zostanie znaleziony(na przykład jeśli został zamknięty przed wykonaniem komendy), wtedy komenda wykona się w głównym buforze WeeChat).
+Note: the command is executed on buffer where /wait was executed (if the buffer does not exist any more, the command is not executed).
 
-Przykłady:
-  wejdzie na kanał za 10 sek:
+Examples:
+  join channel in 10 seconds:
     /wait 10 /join #test
-  ustawi stan nieobecności za 15 min:
+  set away in 15 minutes:
     /wait 15m /away -all I'm away
-  napisze 'hello' za 2 min:
+  say 'hello' in 2 minutes:
     /wait 2m hello
 ----
 
diff --git a/po/cs.po b/po/cs.po
index 78ac4785f..fe2d9a853 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-17 18:32+0100\n"
 "Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2587,6 +2587,7 @@ msgstr "naplánovat spuštění příkazu v budoucnosti"
 msgid "<number>[<unit>] <command>"
 msgstr "<číslo>[<jednotka>] <příkaz>"
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -2597,9 +2598,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/po/de.po b/po/de.po
index dcdbe4831..fb15addff 100644
--- a/po/de.po
+++ b/po/de.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-21 23:31+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
@@ -3110,6 +3110,7 @@ msgstr "Terminiere einen Befehl der ausgeführt werden soll"
 msgid "<number>[<unit>] <command>"
 msgstr "<number>[<unit>] <command>"
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -3120,9 +3121,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/po/es.po b/po/es.po
index 85d7b73bc..ab2d068df 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-17 16:04+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2687,6 +2687,7 @@ msgstr "agenda un comando para ejecutar en el futuro"
 msgid "<number>[<unit>] <command>"
 msgstr "<número>[<unidad>] <comando>"
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -2697,9 +2698,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/po/fr.po b/po/fr.po
index 05b6624d1..6be9df8ca 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: 2019-03-29 20:28+0100\n"
-"PO-Revision-Date: 2019-03-29 20:30+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
+"PO-Revision-Date: 2019-03-29 20:36+0100\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -3040,9 +3040,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
@@ -3062,8 +3061,7 @@ msgstr ""
 "ne commence pas par '/')\n"
 "\n"
 "Note : la commande est exécutée sur le tampon où /wait a été exécuté (si le "
-"tampon n'est pas trouvé, alors la commande est exécutée sur le tampon "
-"WeeChat principal).\n"
+"tampon n'existe plus, la commande n'est pas exécutée).\n"
 "\n"
 "Exemples :\n"
 "  rejoindre le canal dans 10 secondes :\n"
diff --git a/po/hu.po b/po/hu.po
index 78e3b1d77..611691d86 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-02-28 20:18+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2259,6 +2259,7 @@ msgstr ""
 msgid "<number>[<unit>] <command>"
 msgstr ""
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -2269,9 +2270,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
@@ -2281,6 +2281,8 @@ msgid ""
 "  say 'hello' in 2 minutes:\n"
 "    /wait 2m hello"
 msgstr ""
+"parancs: futtatandó parancs (egy '/' autómatikusan hozzáadódik, ha nincs "
+"megadva a parancs elején)\n"
 
 msgid "manage windows"
 msgstr "ablakok kezelése"
diff --git a/po/it.po b/po/it.po
index b2f56f520..9d9d5a01e 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-17 16:04+0100\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2774,6 +2774,7 @@ msgstr "pianifica l'esecuzione di un comando"
 msgid "<number>[<unit>] <command>"
 msgstr "<numero>[<unità>] <comando>"
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -2784,9 +2785,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/po/ja.po b/po/ja.po
index 971dbf1d4..71ee602aa 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-21 23:32+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/master/"
@@ -2940,6 +2940,7 @@ msgstr "コマンドの実行を予約"
 msgid "<number>[<unit>] <command>"
 msgstr "<number>[<unit>] <command>"
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -2950,9 +2951,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/po/pl.po b/po/pl.po
index ea2b1cbf3..a51e3de88 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-21 23:32+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@soltys.info>\n"
 "Language-Team: Polish <kde-i18n-doc@kde.org>\n"
@@ -2995,6 +2995,7 @@ msgstr "planuje komendę do wykonania w przyszłości"
 msgid "<number>[<unit>] <command>"
 msgstr "<liczba>[<jednostka>] <komenda>"
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -3005,9 +3006,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/po/pt.po b/po/pt.po
index 051c91113..98fb60bd0 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-21 23:33+0100\n"
 "Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
 "Language-Team: Portuguese <>\n"
@@ -2954,6 +2954,7 @@ msgstr "agendar um comando para executar no futuro"
 msgid "<number>[<unit>] <command>"
 msgstr "<número>[<unidade>] <comando>"
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -2964,9 +2965,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4c38bdacf..a8a3ef30a 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-11 21:10+0100\n"
 "Last-Translator: Eduardo Elias <camponez@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2738,6 +2738,7 @@ msgstr "agenda a execução de um comando no futuro"
 msgid "<number>[<unit>] <command>"
 msgstr "<número>[<unidade>] <comando>"
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -2748,9 +2749,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/po/ru.po b/po/ru.po
index 319e72ca5..58aa211fa 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-11 21:10+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2282,6 +2282,7 @@ msgstr ""
 msgid "<number>[<unit>] <command>"
 msgstr ""
 
+#, fuzzy
 msgid ""
 " number: amount of time to wait (integer number)\n"
 "   unit: optional, values are:\n"
@@ -2292,9 +2293,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
@@ -2304,6 +2304,8 @@ msgid ""
 "  say 'hello' in 2 minutes:\n"
 "    /wait 2m hello"
 msgstr ""
+"команда: исполняемая команда ('/' автоматически добавляется в начало "
+"команды)\n"
 
 msgid "manage windows"
 msgstr "управление окнами"
diff --git a/po/tr.po b/po/tr.po
index acb986cad..209e33635 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+0100\n"
 "PO-Revision-Date: 2019-03-17 16:04+0100\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2076,9 +2076,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index aa0d6472a..4255b5940 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: 2019-03-29 20:28+0100\n"
+"POT-Creation-Date: 2019-03-29 20:36+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"
@@ -2073,9 +2073,8 @@ msgid ""
 "command: command to execute (or text to send to buffer if command does not "
 "start with '/')\n"
 "\n"
-"Note: command is executed on buffer where /wait was executed (if buffer is "
-"not found (for example if it has been closed before execution of command), "
-"then command is executed on WeeChat core buffer).\n"
+"Note: the command is executed on buffer where /wait was executed (if the "
+"buffer does not exist any more, the command is not executed).\n"
 "\n"
 "Examples:\n"
 "  join channel in 10 seconds:\n"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index dc92ca8ea..cc2c5cfc9 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -8126,10 +8126,9 @@ command_init ()
            "command: command to execute (or text to send to buffer if command "
            "does not start with '/')\n"
            "\n"
-           "Note: command is executed on buffer where /wait was executed (if "
-           "buffer is not found (for example if it has been closed before "
-           "execution of command), then command is executed on WeeChat core "
-           "buffer).\n"
+           "Note: the command is executed on buffer where /wait was executed "
+           "(if the buffer does not exist any more, the command is not "
+           "executed).\n"
            "\n"
            "Examples:\n"
            "  join channel in 10 seconds:\n"
diff --git a/src/core/wee-input.c b/src/core/wee-input.c
index 7538b541d..31c7e3537 100644
--- a/src/core/wee-input.c
+++ b/src/core/wee-input.c
@@ -374,12 +374,7 @@ input_data_timer_cb (const void *pointer, void *data, int remaining_calls)
 
     if (timer_args[0] && timer_args[1])
     {
-        /* search buffer, fallback to core buffer if not found */
         ptr_buffer = gui_buffer_search_by_full_name (timer_args[0]);
-        if (!ptr_buffer)
-            ptr_buffer = gui_buffer_search_main ();
-
-        /* execute command */
         if (ptr_buffer)
             (void) input_data (ptr_buffer, timer_args[1], timer_args[2]);
     }