aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Morales <hel.sheep@gmail.com>2015-06-20 16:10:29 -0300
committerJustin M. Keyes <justinkz@gmail.com>2015-06-21 02:02:00 -0400
commit896328553061ce2f39d138747ee4b977bbc31298 (patch)
tree98d6c0fad1d513c6033effaa853add06852a7c5a
parent2c40d117e6a378b506a37c8bb467f95bc7cfa447 (diff)
downloadrneovim-896328553061ce2f39d138747ee4b977bbc31298.tar.gz
rneovim-896328553061ce2f39d138747ee4b977bbc31298.tar.bz2
rneovim-896328553061ce2f39d138747ee4b977bbc31298.zip
defaults: set 'tabpagemax' to 50 by default. #2869
Re: https://github.com/neovim/neovim/issues/2676
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/doc/starting.txt2
-rw-r--r--runtime/doc/vim_diff.txt1
-rw-r--r--src/nvim/option.c4
4 files changed, 5 insertions, 4 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 4477c2e974..0808278657 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6382,7 +6382,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'tabpagemax'* *'tpm'*
-'tabpagemax' 'tpm' number (default 10)
+'tabpagemax' 'tpm' number (default 50)
global
{not available when compiled without the |+windows|
feature}
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 4fd449e05c..aa37913779 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -300,7 +300,7 @@ argument.
*-p*
-p[N] Open N tab pages. If [N] is not given, one tab page is opened
for every file given as argument. The maximum is set with
- 'tabpagemax' pages (default 10). If there are more tab pages
+ 'tabpagemax' pages (default 50). If there are more tab pages
than arguments, the last few tab pages will be editing an
empty file. Also see |tabpage|.
*-d*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 1770781a55..5ca6e128e6 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -42,6 +42,7 @@ these differences.
- 'nocompatible' is always set
- 'nrformats' defaults to "hex"
- 'smarttab' is set by default
+- 'tabpagemax' defaults to 50
- 'tags' defaults to "./tags;,tags"
- 'ttyfast' is always set
- 'wildmenu' is set by default
diff --git a/src/nvim/option.c b/src/nvim/option.c
index b45002e29c..06995eede5 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1472,9 +1472,9 @@ static vimoption_T
{"tabline", "tal", P_STRING|P_VI_DEF|P_RALL,
(char_u *)&p_tal, PV_NONE,
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
- {"tabpagemax", "tpm", P_NUM|P_VI_DEF,
+ {"tabpagemax", "tpm", P_NUM|P_VIM,
(char_u *)&p_tpm, PV_NONE,
- {(char_u *)10L, (char_u *)0L} SCRIPTID_INIT},
+ {(char_u *)10L, (char_u *)50L} SCRIPTID_INIT},
{"tabstop", "ts", P_NUM|P_VI_DEF|P_RBUF,
(char_u *)&p_ts, PV_TS,
{(char_u *)8L, (char_u *)0L} SCRIPTID_INIT},