aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--runtime/doc/options.txt40
-rw-r--r--runtime/doc/quickref.txt2
-rw-r--r--runtime/doc/vim_diff.txt2
3 files changed, 4 insertions, 40 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a5e8e082c1..f591db3250 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6504,46 +6504,10 @@ A jump table for the options with a short description can be found at |Q_op|.
{not available when compiled without the |+statusline| feature}
*'toolbar'* *'tb'*
-'toolbar' 'tb' string (default "icons,tooltips")
- global
- {only for |+GUI_GTK|, |+GUI_Athena|, and |+GUI_Motif|}
- The contents of this option controls various toolbar settings. The
- possible values are:
- icons Toolbar buttons are shown with icons.
- text Toolbar buttons shown with text.
- horiz Icon and text of a toolbar button are
- horizontally arranged. {only in GTK+ 2 GUI}
- tooltips Tooltips are active for toolbar buttons.
- Tooltips refer to the popup help text which appears after the mouse
- cursor is placed over a toolbar button for a brief moment.
-
- If you want the toolbar to be shown with icons as well as text, do the
- following: >
- :set tb=icons,text
-< Motif and Athena cannot display icons and text at the same time. They
- will show icons if both are requested.
-
- If none of the strings specified in 'toolbar' are valid or if
- 'toolbar' is empty, this option is ignored. If you want to disable
- the toolbar, you need to set the 'guioptions' option. For example: >
- :set guioptions-=T
-< Also see |gui-toolbar|.
+'toolbar' 'tb' Removed. |vim-differences| {Nvim}
*'toolbariconsize'* *'tbis'*
-'toolbariconsize' 'tbis' string (default "small")
- global
- {only in the GTK+ 2 GUI}
- Controls the size of toolbar icons. The possible values are:
- tiny Use tiny toolbar icons.
- small Use small toolbar icons (default).
- medium Use medium-sized toolbar icons.
- large Use large toolbar icons.
- The exact dimensions in pixels of the various icon sizes depend on
- the current theme. Common dimensions are large=32x32, medium=24x24,
- small=20x20 and tiny=16x16.
-
- If 'toolbariconsize' is empty, the global default size as determined
- by user preferences or the current theme is used.
+'toolbariconsize' 'tbis' Removed. |vim-differences| {Nvim}
*'ttybuiltin'* *'tbi'* *'nottybuiltin'* *'notbi'*
'ttybuiltin' 'tbi' Removed. |vim-differences| {Nvim}
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index b9ee60318a..c42d98ba90 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -898,8 +898,6 @@ Short explanation of each option: *option-list*
'titlelen' percentage of 'columns' used for window title
'titleold' old title, restored when exiting
'titlestring' string to use for the Vim window title
-'toolbar' 'tb' GUI: which items to show in the toolbar
-'toolbariconsize' 'tbis' size of the toolbar icons (for GTK 2 only)
'ttimeout' time out on mappings
'ttimeoutlen' 'ttm' time out time for key codes in milliseconds
'ttytype' 'tty' alias for 'term'
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 52146cd946..fe4b61815b 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -159,6 +159,8 @@ Other options:
'termencoding'
'textauto'
'textmode'
+ 'toolbar'
+ 'toolbariconsize'
'ttybuiltin'
'ttymouse'
'weirdinvert'