diff options
author | Marco Hinz <mh.codebro@gmail.com> | 2015-07-14 13:53:45 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2015-07-15 22:03:35 -0400 |
commit | 1e031650742310920e7d8ed10c02ceccb54e0a89 (patch) | |
tree | 6e1f434b4ff3e67e3531b1b21661733b23ce7115 /runtime | |
parent | 59784b91dbf97388281c1eb6989e2e770eb7ecac (diff) | |
download | rneovim-1e031650742310920e7d8ed10c02ceccb54e0a89.tar.gz rneovim-1e031650742310920e7d8ed10c02ceccb54e0a89.tar.bz2 rneovim-1e031650742310920e7d8ed10c02ceccb54e0a89.zip |
Remove :tearoff #3007
This also removes the 't' flag from 'guioptions'.
Side effect: :term[inal] -> :te[rminal]
Closes #3003.
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/gui.txt | 15 | ||||
-rw-r--r-- | runtime/doc/gui_w32.txt | 29 | ||||
-rw-r--r-- | runtime/doc/index.txt | 2 | ||||
-rw-r--r-- | runtime/doc/options.txt | 7 | ||||
-rw-r--r-- | runtime/doc/usr_09.txt | 4 | ||||
-rw-r--r-- | runtime/doc/usr_42.txt | 7 | ||||
-rw-r--r-- | runtime/doc/various.txt | 4 | ||||
-rw-r--r-- | runtime/doc/vim_diff.txt | 6 |
8 files changed, 10 insertions, 64 deletions
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index 8c87e5e4ac..12fca33d64 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -489,18 +489,6 @@ Pressing <F4> will start the menu. You can now use the cursor keys to select a menu entry. Hit <Enter> to execute it. Hit <Esc> if you want to cancel. This does require the |+menu| feature enabled at compile time. - *tear-off-menus* -GTK+ and Motif support Tear-off menus. These are sort of sticky menus or -pop-up menus that are present all the time. If the resizing does not work -correctly, this may be caused by using something like "Vim*geometry" in the -defaults. Use "Vim.geometry" instead. - -The Win32 GUI version emulates Motif's tear-off menus. Actually, a Motif user -will spot the differences easily, but hopefully they're just as useful. You -can also use the |:tearoff| command together with |hidden-menus| to create -floating menus that do not appear on the main menu bar. - - 5.2 Creating New Menus *creating-menus* *:me* *:menu* *:noreme* *:noremenu* @@ -750,8 +738,7 @@ nr Name Normal action ~ *hidden-menus* *win32-hidden-menus* In the Win32 and GTK+ GUI, starting a menu name with ']' excludes that menu -from the main menu bar. You must then use the |:popup| or |:tearoff| command -to display it. +from the main menu bar. You must then use the |:popup| command to display it. *popup-menu* You can define the special menu "PopUp". This is the menu that is displayed diff --git a/runtime/doc/gui_w32.txt b/runtime/doc/gui_w32.txt index 8132d47cf1..2bf4d72343 100644 --- a/runtime/doc/gui_w32.txt +++ b/runtime/doc/gui_w32.txt @@ -353,35 +353,6 @@ changes this. When prepending ":browse" before file editing commands, a file requester is used to allow you to select an existing file. See |:browse|. - -6.3 Tearoff Menus - -The Win32 GUI emulates Motif's tear-off menus. At the top of each menu you -will see a small graphic "rip here" sign. Selecting it will cause a floating -window to be created with the same menu entries on it. The floating menu can -then be accessed just as if it was the original (including sub-menus), but -without having to go to the menu bar each time. -This is most useful if you find yourself using a command buried in a sub-menu -over and over again. -The tearoff menus can be positioned where you like, and always stay just above -the Main Vim window. You can get rid of them by closing them as usual; they -also of course close when you exit Vim. - - *:tearoff* *:te* -:te[aroff] {name} Tear-off the menu {name}. The menu named must have at - least one subentry, but need not appear on the - menu-bar (see |win32-hidden-menus|). - -Example: > - :tearoff File -will make the "File" menu (if there is one) appear as a tearoff menu. > - - :amenu ]Toolbar.Make :make<CR> - :tearoff ]Toolbar -This creates a floating menu that doesn't exist on the main menu-bar. - -Note that a menu that starts with ']' will not be displayed. - ============================================================================== 7. Command line arguments *gui-w32-cmdargs* diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 2338906db2..fd5bf1c50e 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1522,7 +1522,7 @@ tag command action ~ |:tab| :tab create new tab when opening new window |:tag| :ta[g] jump to tag |:tags| :tags show the contents of the tag stack -|:tearoff| :te[aroff] tear-off a menu +|:terminal| :te[rminal] open a terminal buffer |:tfirst| :tf[irst] jump to first matching tag |:throw| :th[row] throw an exception |:tjump| :tj[ump] like ":tselect", but jump directly when there diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 6c184a5a59..9f482b35ff 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3256,8 +3256,8 @@ A jump table for the options with a short description can be found at |Q_op|. screen. *'guioptions'* *'go'* -'guioptions' 'go' string (default "egmrLtT" (MS-Windows), - "aegimrLtT" (GTK, Motif and Athena)) +'guioptions' 'go' string (default "egmrLT" (MS-Windows), + "aegimrLT" (GTK, Motif and Athena)) global {only available when compiled with GUI enabled} This option only has an effect in the GUI version of Vim. It is a @@ -3319,9 +3319,6 @@ A jump table for the options with a short description can be found at |Q_op|. 'g' Grey menu items: Make menu items that are not active grey. If 'g' is not included inactive menu items are not shown at all. Exception: Athena will always use grey menu items. - *'go-t'* - 't' Include tearoff menu items. Currently only works for Win32, - GTK+, and Motif 1.2 GUI. *'go-T'* 'T' Include Toolbar. Currently only in Win32, GTK+, Motif, and Athena GUIs. diff --git a/runtime/doc/usr_09.txt b/runtime/doc/usr_09.txt index 68575f5184..05cc32bceb 100644 --- a/runtime/doc/usr_09.txt +++ b/runtime/doc/usr_09.txt @@ -81,10 +81,6 @@ is Edit/Global Settings. You will find these entries: Toggle Left Scrollbar make a scrollbar appear/disappear at the left Toggle Right Scrollbar make a scrollbar appear/disappear at the right -On most systems you can tear-off the menus. Select the top item of the menu, -the one that looks like a dashed line. You will get a separate window with -the items of the menu. It will hang around until you close the window. - THE TOOLBAR diff --git a/runtime/doc/usr_42.txt b/runtime/doc/usr_42.txt index 1d16112aa0..b9102f3f7b 100644 --- a/runtime/doc/usr_42.txt +++ b/runtime/doc/usr_42.txt @@ -268,13 +268,6 @@ command like: > but are completely removed. (Does not work on all systems.) - t When removed the tearoff feature is not enabled. - -The dotted line at the top of a menu is not a separator line. When you select -this item, the menu is "teared-off": It is displayed in a separate window. -This is called a tearoff menu. This is useful when you use the same menu -often. - For translating menu items, see |:menutrans|. Since the mouse has to be used to select a menu item, it is a good idea to use diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 7d8853f4cd..a241e2beaf 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -213,8 +213,8 @@ g8 Print the hex values of the bytes used in the *:sh* *:shell* *E371* *E360* :sh[ell] Removed. |vim-differences| {Nvim} - *:term* *:terminal* -:term[inal][!] {cmd} Spawns {cmd} using the current value of 'shell' and + *:terminal* *:te* +:te[rminal][!] {cmd} Spawns {cmd} using the current value of 'shell' and 'shellcmdflag' in a new terminal buffer. This is equivalent to: > diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 6ad3dab246..1d8d129338 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -28,13 +28,14 @@ these differences. ============================================================================== 2. Option defaults *nvim-option-defaults* -- 'autoindent' is set by default. +- 'autoindent' is set by default - 'autoread' is set by default - 'backspace' defaults to "indent,eol,start" - 'complete' doesn't include "i" - 'display' defaults to "lastline" - 'encoding' defaults to "utf-8" - 'formatoptions' defaults to "tcqj" +- 'guioptions' doesn't include "t" - 'hlsearch' is set by default - 'incsearch' is set by default - 'langnoremap' is set by default @@ -148,8 +149,9 @@ Other options: Other commands: :fixdel - :mode no longer accepts an argument + :mode (no longer accepts an argument) :shell + :tearoff Other compile-time features: EBCDIC |