summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog2
-rw-r--r--doc/de/autogen/user/weechat_options.txt5
-rw-r--r--doc/en/autogen/user/weechat_options.txt5
-rw-r--r--doc/fr/autogen/user/weechat_options.txt5
-rw-r--r--doc/it/autogen/user/weechat_options.txt5
-rw-r--r--po/cs.po5
-rw-r--r--po/de.po5
-rw-r--r--po/es.po5
-rw-r--r--po/fr.po7
-rw-r--r--po/hu.po5
-rw-r--r--po/it.po5
-rw-r--r--po/ja.po5
-rw-r--r--po/pl.po5
-rw-r--r--po/pt_BR.po5
-rw-r--r--po/ru.po5
-rw-r--r--po/weechat.pot5
-rw-r--r--src/core/wee-config.c6
-rw-r--r--src/core/wee-config.h1
-rw-r--r--src/gui/gui-input.c13
19 files changed, 84 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d7146d71..64844ca9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ v0.3.9-dev, 2012-07-07
Version 0.3.9 (under dev!)
--------------------------
+* core: add option weechat.look.jump_smart_back_to_buffer (jump back to initial
+ buffer after reaching end of hotlist, on by default, which is old behaviour)
* core: add default key alt+"s" (toggle aspell)
* core: add cmake option "MANDIR" (bug #36776)
* core: add callback "nickcmp" in buffers
diff --git a/doc/de/autogen/user/weechat_options.txt b/doc/de/autogen/user/weechat_options.txt
index 6d2f69759..92e0cca8f 100644
--- a/doc/de/autogen/user/weechat_options.txt
+++ b/doc/de/autogen/user/weechat_options.txt
@@ -578,6 +578,11 @@
** Typ: boolesch
** Werte: on, off (Standardwert: `on`)
+* [[option_weechat.look.jump_smart_back_to_buffer]] *weechat.look.jump_smart_back_to_buffer*
+** Beschreibung: `jump back to initial buffer after reaching end of hotlist`
+** Typ: boolesch
+** Werte: on, off (Standardwert: `on`)
+
* [[option_weechat.look.mouse]] *weechat.look.mouse*
** Beschreibung: `Mausunterstützung einschalten`
** Typ: boolesch
diff --git a/doc/en/autogen/user/weechat_options.txt b/doc/en/autogen/user/weechat_options.txt
index a75821c60..dccfcd596 100644
--- a/doc/en/autogen/user/weechat_options.txt
+++ b/doc/en/autogen/user/weechat_options.txt
@@ -578,6 +578,11 @@
** type: boolean
** values: on, off (default value: `on`)
+* [[option_weechat.look.jump_smart_back_to_buffer]] *weechat.look.jump_smart_back_to_buffer*
+** description: `jump back to initial buffer after reaching end of hotlist`
+** type: boolean
+** values: on, off (default value: `on`)
+
* [[option_weechat.look.mouse]] *weechat.look.mouse*
** description: `enable mouse support`
** type: boolean
diff --git a/doc/fr/autogen/user/weechat_options.txt b/doc/fr/autogen/user/weechat_options.txt
index 1700023eb..0c28fb41c 100644
--- a/doc/fr/autogen/user/weechat_options.txt
+++ b/doc/fr/autogen/user/weechat_options.txt
@@ -578,6 +578,11 @@
** type: booléen
** valeurs: on, off (valeur par défaut: `on`)
+* [[option_weechat.look.jump_smart_back_to_buffer]] *weechat.look.jump_smart_back_to_buffer*
+** description: `retourner au tampon initial après avoir atteint la fin de la hotlist`
+** type: booléen
+** valeurs: on, off (valeur par défaut: `on`)
+
* [[option_weechat.look.mouse]] *weechat.look.mouse*
** description: `activer le support de la souris`
** type: booléen
diff --git a/doc/it/autogen/user/weechat_options.txt b/doc/it/autogen/user/weechat_options.txt
index 38a64f880..3b8b9dd97 100644
--- a/doc/it/autogen/user/weechat_options.txt
+++ b/doc/it/autogen/user/weechat_options.txt
@@ -578,6 +578,11 @@
** tipo: bool
** valori: on, off (valore predefinito: `on`)
+* [[option_weechat.look.jump_smart_back_to_buffer]] *weechat.look.jump_smart_back_to_buffer*
+** descrizione: `jump back to initial buffer after reaching end of hotlist`
+** tipo: bool
+** valori: on, off (valore predefinito: `on`)
+
* [[option_weechat.look.mouse]] *weechat.look.mouse*
** descrizione: `abilita il supporto del mouse`
** tipo: bool
diff --git a/po/cs.po b/po/cs.po
index ed7e1e011..7f0530d0e 100644
--- a/po/cs.po
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+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"
@@ -2503,6 +2503,9 @@ msgstr ""
"skočit na posledně navštívený buffer při zavírání bufferu (pokud je vypnuto "
"skočí na číslo bufferu - 1)"
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr ""
diff --git a/po/de.po b/po/de.po
index 6fbb3f84f..6e15e17ae 100644
--- a/po/de.po
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+0200\n"
"PO-Revision-Date: 2012-06-30 14:28+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -2747,6 +2747,9 @@ msgstr ""
"wird (wenn diese Funktion deaktiviert ist wird zum Buffer gewechselt der die "
"relative Position -1 einnimmt)"
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr "Mausunterstützung einschalten"
diff --git a/po/es.po b/po/es.po
index 437dbc985..72c381fad 100644
--- a/po/es.po
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2645,6 +2645,9 @@ msgstr ""
"salta al buffer visitado anteriormente al cerrar un buffer (si es "
"desactivado, entonces salta al buffer de número menor)"
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr "habilitar soporte para ratón"
diff --git a/po/fr.po b/po/fr.po
index 5981e81df..992a7b727 100644
--- a/po/fr.po
+++ b/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-06 12:13+0200\n"
-"PO-Revision-Date: 2012-07-07 11:26+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+0200\n"
+"PO-Revision-Date: 2012-07-07 13:35+0200\n"
"Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: French\n"
@@ -2654,6 +2654,9 @@ msgstr ""
"sauter au tampon précédemment visité lors de la fermeture d'un tampon (si "
"désactivé, alors le saut se fait vers le numéro de tampon - 1)"
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr "retourner au tampon initial après avoir atteint la fin de la hotlist"
+
msgid "enable mouse support"
msgstr "activer le support de la souris"
diff --git a/po/hu.po b/po/hu.po
index e5d54fdfa..ed3111c54 100644
--- a/po/hu.po
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+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"
@@ -2141,6 +2141,9 @@ msgid ""
"jump to buffer number - 1)"
msgstr ""
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr ""
diff --git a/po/it.po b/po/it.po
index d96e90427..7db290522 100644
--- a/po/it.po
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2635,6 +2635,9 @@ msgstr ""
"passa al buffer visitato in precedenza alla chiusura di un buffer (se "
"disabilitato, allora passa al buffer numero -1)"
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr "abilita il supporto del mouse"
diff --git a/po/ja.po b/po/ja.po
index a089f84c9..f6493024e 100644
--- a/po/ja.po
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/WeeChat>\n"
@@ -2585,6 +2585,9 @@ msgstr ""
"バッファを閉じた場合は一つ前に訪れていたバッファに移動 (無効にされた場合は、"
"バッファ番号の一つ少ないものに移動)"
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr "マウスサポートの有効化"
diff --git a/po/pl.po b/po/pl.po
index f395df0ee..048ba3604 100644
--- a/po/pl.po
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+0200\n"
"PO-Revision-Date: 2012-06-03 09:49+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -2643,6 +2643,9 @@ msgstr ""
"skocz do poprzedniego buforu, po zamknięciu obecnego (jeśli wyłączona, wtedy "
"skocz do buforu numer -1)"
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr "włącza wsparcie dla myszy"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 3e79e6ade..767bf56df 100644
--- a/po/pt_BR.po
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+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"
@@ -2579,6 +2579,9 @@ msgstr ""
"pula para o buffer previamente visitado quando estiver fechando um buffer "
"(se desabilitado, então pula para o buffer número -1)"
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 5c5dd9a26..95425642d 100644
--- a/po/ru.po
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+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"
@@ -2168,6 +2168,9 @@ msgid ""
"jump to buffer number - 1)"
msgstr ""
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr ""
diff --git a/po/weechat.pot b/po/weechat.pot
index 811e18880..4e940258c 100644
--- a/po/weechat.pot
+++ b/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-06 12:13+0200\n"
+"POT-Creation-Date: 2012-07-07 13:35+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"
@@ -1888,6 +1888,9 @@ msgid ""
"jump to buffer number - 1)"
msgstr ""
+msgid "jump back to initial buffer after reaching end of hotlist"
+msgstr ""
+
msgid "enable mouse support"
msgstr ""
diff --git a/src/core/wee-config.c b/src/core/wee-config.c
index 94ace91cd..cccdcca36 100644
--- a/src/core/wee-config.c
+++ b/src/core/wee-config.c
@@ -123,6 +123,7 @@ struct t_config_option *config_look_item_time_format;
struct t_config_option *config_look_item_buffer_filter;
struct t_config_option *config_look_jump_current_to_previous_buffer;
struct t_config_option *config_look_jump_previous_buffer_when_closing;
+struct t_config_option *config_look_jump_smart_back_to_buffer;
struct t_config_option *config_look_mouse;
struct t_config_option *config_look_mouse_timer_delay;
struct t_config_option *config_look_nickmode;
@@ -2029,6 +2030,11 @@ config_weechat_init_options ()
N_("jump to previously visited buffer when closing a buffer (if "
"disabled, then jump to buffer number - 1)"),
NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
+ config_look_jump_smart_back_to_buffer = config_file_new_option (
+ weechat_config_file, ptr_section,
+ "jump_smart_back_to_buffer", "boolean",
+ N_("jump back to initial buffer after reaching end of hotlist"),
+ NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL);
config_look_mouse = config_file_new_option (
weechat_config_file, ptr_section,
"mouse", "boolean",
diff --git a/src/core/wee-config.h b/src/core/wee-config.h
index 738ddeb2b..53ee5f6fc 100644
--- a/src/core/wee-config.h
+++ b/src/core/wee-config.h
@@ -146,6 +146,7 @@ extern struct t_config_option *config_look_item_time_format;
extern struct t_config_option *config_look_item_buffer_filter;
extern struct t_config_option *config_look_jump_current_to_previous_buffer;
extern struct t_config_option *config_look_jump_previous_buffer_when_closing;
+extern struct t_config_option *config_look_jump_smart_back_to_buffer;
extern struct t_config_option *config_look_mouse;
extern struct t_config_option *config_look_mouse_timer_delay;
extern struct t_config_option *config_look_nickmode;
diff --git a/src/gui/gui-input.c b/src/gui/gui-input.c
index 7c3d205c6..cd430d55b 100644
--- a/src/gui/gui-input.c
+++ b/src/gui/gui-input.c
@@ -1264,9 +1264,16 @@ gui_input_jump_smart (struct t_gui_buffer *buffer)
{
if (gui_hotlist_initial_buffer)
{
- gui_window_switch_to_buffer (window,
- gui_hotlist_initial_buffer, 1);
- gui_window_scroll_bottom (window);
+ if (CONFIG_BOOLEAN(config_look_jump_smart_back_to_buffer))
+ {
+ gui_window_switch_to_buffer (window,
+ gui_hotlist_initial_buffer, 1);
+ gui_window_scroll_bottom (window);
+ }
+ gui_hotlist_initial_buffer = NULL;
+ }
+ else
+ {
gui_hotlist_initial_buffer = NULL;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 15:25:51 +0000