summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2014-10-14 15:51:30 +0200
committermathieui <mathieui@mathieui.net>2014-10-14 15:51:30 +0200
commit545ad1bd71e87a482b357f5b49a0898be73478d8 (patch)
treee513febd81f0c3d338b047f0672e5353e92534d4 /data
parent37fe4be7ec35278f23c9f5c07607c3a14e6b6753 (diff)
parent088c6c6a0b46309d17c4b0ba5939a2dd200c7002 (diff)
downloadpoezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.gz
poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.bz2
poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.tar.xz
poezio-545ad1bd71e87a482b357f5b49a0898be73478d8.zip
Merge branch 'master' of git.poez.io:poezio into slix
Conflicts: src/core/handlers.py src/tabs/xmltab.py
Diffstat (limited to 'data')
-rw-r--r--data/default_config.cfg8
1 files changed, 6 insertions, 2 deletions
diff --git a/data/default_config.cfg b/data/default_config.cfg
index ef863ee4..c1f766b0 100644
--- a/data/default_config.cfg
+++ b/data/default_config.cfg
@@ -116,9 +116,12 @@ use_bookmarks_method =
# use this option to force the use of local bookmarks
# possible values are: anything/false
-
use_remote_bookmarks = true
+# Whether you want all bookmarks, even those without
+# autojoin, to be open on startup
+open_all_bookmarks = false
+
# What will be put after the name, when using autocompletion at the
# beginning of the input. A space will always be added after that
after_completion = ,
@@ -461,8 +464,9 @@ show_useless_separator = false
exec_remote = false
# Path of the FIFO in which the remote commands will be sent.
+# The "poezio.fifo" file will be created in this directory
# Used with exec_remote set to true, see the documentation of /link for details
-# Defaults to ./poezio.fifo
+# Defaults to ./
remote_fifo_path =
# Defines if all tabs are resized at the same time (if set to false)