summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog.adoc1
-rw-r--r--doc/de/weechat_user.de.adoc2
-rw-r--r--doc/en/weechat_user.en.adoc3
-rw-r--r--doc/fr/weechat_user.fr.adoc1
-rw-r--r--doc/it/weechat_user.it.adoc2
-rw-r--r--doc/ja/weechat_user.ja.adoc2
-rw-r--r--doc/pl/weechat_user.pl.adoc2
-rw-r--r--src/gui/curses/gui-curses-key.c1
8 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
index dfd118649..c53087b2e 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 default key kbd:[Alt+Enter] to insert a newline (issue #1498)
* core: add flag "input_multiline" in buffer (issue #984, issue #1063)
* core: add a scalable WeeChat logo (SVG) (issue #1454, issue #1456)
* core: add case sensitive wildcard matching comparison operator (`+==*+` and `+!!*+`) and case sensitive/insensitive include comparison operators (`+==-+`, `+!!-+`, `+=-+`, `+!-+`) in evaluation of expressions
diff --git a/doc/de/weechat_user.de.adoc b/doc/de/weechat_user.de.adoc
index 358de05f8..7c8b10ddf 100644
--- a/doc/de/weechat_user.de.adoc
+++ b/doc/de/weechat_user.de.adoc
@@ -1664,6 +1664,8 @@ und um eine Hilfe zu erhalten wie man es nutzt: `+/help buffer_autoset+`.
| kbd:[Enter] +
kbd:[Ctrl+j] +
kbd:[Ctrl+m] | führt einen Befehl aus oder sendet den Text (im Such-Modus: stoppt Suche). | `+/input return+`
+// TRANSLATION MISSING
+| kbd:[Alt+Enter] | Insert a newline. | `+/input insert \n+`
| kbd:[↑] | ruft vorherigen Befehl oder Nachricht aus dem Verlaufsspeicher auf (im Such-Modus: rückwärts suchen). | `+/input history_previous+`
| kbd:[↓] | ruft nächsten Befehl oder Nachricht aus dem Verlaufsspeicher auf (im Such-Modus: vorwärts suchen). | `+/input history_next+`
| kbd:[Ctrl+↑] | ruft vorherigen Befehl/Nachricht aus dem globalen Verlaufsspeicher auf (für alle Buffer). | `+/input history_global_previous+`
diff --git a/doc/en/weechat_user.en.adoc b/doc/en/weechat_user.en.adoc
index fc56d8fb0..8d21cc8b0 100644
--- a/doc/en/weechat_user.en.adoc
+++ b/doc/en/weechat_user.en.adoc
@@ -1631,12 +1631,13 @@ with `+/script install buffer_autoset.py+` and get help with
| kbd:[Enter] +
kbd:[Ctrl+j] +
kbd:[Ctrl+m] | Execute command or send message (in search mode: stop search). | `+/input return+`
+| kbd:[Alt+Enter] | Insert a newline. | `+/input insert \n+`
| kbd:[↑] | Call previous command/message (in search mode: search up). | `+/input history_previous+`
| kbd:[↓] | Call next command/message (in search mode: search down). | `+/input history_next+`
| kbd:[Ctrl+↑] | Call previous command/message in global history (common for all buffers). | `+/input history_global_previous+`
| kbd:[Ctrl+↓] | Call next command/message in global history (common for all buffers). | `+/input history_global_next+`
| kbd:[Alt+d] | Delete next word in command line (deleted string is copied to the internal clipboard). | `+/input delete_next_word+`
-| kbd:[Alt+k] | Grab a key and insert its code (and command bound if key exists) in command line. | `+/input grab_key_command+`
+| kbd:[Alt+k] | Grab a key and insert its code (and command bound if key exists) in command line. | `+/input grab_key_command+`
| kbd:[Alt+r] | Delete entire command line. | `+/input delete_line+`
| kbd:[Alt+s] | Toggle spell checker. | `+/mute spell toggle+`
|===
diff --git a/doc/fr/weechat_user.fr.adoc b/doc/fr/weechat_user.fr.adoc
index c11ace290..381646751 100644
--- a/doc/fr/weechat_user.fr.adoc
+++ b/doc/fr/weechat_user.fr.adoc
@@ -1685,6 +1685,7 @@ avec `+/help buffer_autoset+`.
| kbd:[Enter] +
kbd:[Ctrl+j] +
kbd:[Ctrl+m] | Exécuter la commande ou envoyer le message (en mode recherche : arrêter la recherche). | `+/input return+`
+| kbd:[Alt+Enter] | Insérer une nouvelle ligne. | `+/input insert \n+`
| kbd:[↑] | Rappeler la commande précédente (en mode recherche : chercher plus haut). | `+/input history_previous+`
| kbd:[↓] | Rappeler la commande suivante (en mode recherche : chercher plus bas). | `+/input history_next+`
| kbd:[Ctrl+↑] | Rappeler la commande précédente dans l'historique global (commun à tous les tampons). | `+/input history_global_previous+`
diff --git a/doc/it/weechat_user.it.adoc b/doc/it/weechat_user.it.adoc
index e925da217..bab4edb60 100644
--- a/doc/it/weechat_user.it.adoc
+++ b/doc/it/weechat_user.it.adoc
@@ -1726,6 +1726,8 @@ with `+/script install buffer_autoset.py+` and get help with `+/help buffer_auto
| kbd:[Invio] +
kbd:[Ctrl+j] +
kbd:[Ctrl+m] | Esegue comando o invia messaggio (in modalità ricerca: ferma ricerca). | `+/input return+`
+// TRANSLATION MISSING
+| kbd:[Alt+Enter] | Insert a newline. | `+/input insert \n+`
| kbd:[↑] | Chiama comando/messaggio precedente (in modalità ricerca: cerca in alto). | `+/input history_previous+`
| kbd:[↓] | Chiama comando/messaggio precedente (in modalità ricerca: cerca in basso). | `+/input history_next+`
| kbd:[Ctrl+↑] | Chiama il comando/messaggio precedente nella cronologia globale (identico per tutti i buffer). | `+/input history_global_previous+`
diff --git a/doc/ja/weechat_user.ja.adoc b/doc/ja/weechat_user.ja.adoc
index 513097242..42e06587f 100644
--- a/doc/ja/weechat_user.ja.adoc
+++ b/doc/ja/weechat_user.ja.adoc
@@ -1641,6 +1641,8 @@ irc サーバ "freenode" に含まれる全てのバッファに対して設定
| kbd:[Enter] +
kbd:[Ctrl+j] +
kbd:[Ctrl+m] | コマンドを実行するか、メッセージを送信する (検索モードの場合: 検索の終了) | `+/input return+`
+// TRANSLATION MISSING
+| kbd:[Alt+Enter] | Insert a newline. | `+/input insert \n+`
| kbd:[↑] | 前のコマンド/メッセージを呼び出す (検索モードの場合: 上方向に検索) | `+/input history_previous+`
| kbd:[↓] | 次のコマンド/メッセージを呼び出す (検索モードの場合: 下方向に検索) | `+/input history_next+`
| kbd:[Ctrl+↑] | グローバル履歴から前のコマンド/メッセージを呼び出す (すべてのバッファに対して共通の履歴) | `+/input history_global_previous+`
diff --git a/doc/pl/weechat_user.pl.adoc b/doc/pl/weechat_user.pl.adoc
index 39b9b3632..3f37e97b6 100644
--- a/doc/pl/weechat_user.pl.adoc
+++ b/doc/pl/weechat_user.pl.adoc
@@ -1640,6 +1640,8 @@ Można ją zapisać za pomocą skryptu _buffer_autoset.py_: można go zaintalowa
| kbd:[Enter] +
kbd:[Ctrl+j] +
kbd:[Ctrl+m] | Wykonaj komendę lub wyślij wiadomość (w trybie wyszukiwania: przerwij wyszukiwanie). | `+/input return+`
+// TRANSLATION MISSING
+| kbd:[Alt+Enter] | Insert a newline. | `+/input insert \n+`
| kbd:[↑] | Pokaż poprzednią komendę/wiadomość (w trybie wyszukiwania: szukaj w górę). | `+/input history_previous+`
| kbd:[↓] | Pokaż następną komendę/wiadomość (w trybie wyszukiwania: szukaj w dół). | `+/input history_next+`
| kbd:[Ctrl+↑] | Pokaż poprzednią komendę/wiadomość w historii globalnej (wspólnej dla wszystkich buforów). | `+/input history_global_previous+`
diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c
index eef9c5aaf..ecfb1b15d 100644
--- a/src/gui/curses/gui-curses-key.c
+++ b/src/gui/curses/gui-curses-key.c
@@ -83,6 +83,7 @@ gui_key_default_bindings (int context)
{
BIND(/* <enter> */ "ctrl-M", "/input return");
BIND(/* <enter> */ "ctrl-J", "/input return");
+ BIND(/* m-<enter> */ "meta-ctrl-M", "/input insert \\n");
BIND(/* <tab> */ "ctrl-I", "/input complete_next");
BIND(/* s-<tab> */ "meta2-Z", "/input complete_previous");
BIND(/* ^R */ "ctrl-R", "/input search_text_here");
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 21:37:04 +0000