Skip to content

Commit f88fb5e

Browse files
authored
Merge pull request #1085 from ychin/clean-up-docs
Clean up MacVim docs
2 parents e0d1117 + 8f476ff commit f88fb5e

2 files changed

Lines changed: 42 additions & 30 deletions

File tree

runtime/doc/gui.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,7 @@ The window toolbar uses the ToolbarLine and ToolbarButton highlight groups.
837837
When splitting the window the window toolbar is not copied to the new window.
838838

839839
*popup-menu*
840-
In the Win32, GTK+, Motif, Athena and Photon GUI, you can define the
840+
In the Win32, MacVim, GTK+, Motif, Athena and Photon GUI, you can define the
841841
special menu "PopUp". This is the menu that is displayed when the right mouse
842842
button is pressed, if 'mousemodel' is set to popup or popup_setpos.
843843
Example: >
@@ -967,13 +967,14 @@ See section |42.4| in the user manual.
967967

968968
*:tmenu* *:tm*
969969
:tm[enu] {menupath} {rhs} Define a tip for a menu or tool. {only in
970-
X11 and Win32 GUI}
970+
X11, MacVim, and Win32 GUI}
971971

972-
:tm[enu] [menupath] List menu tips. {only in X11 and Win32 GUI}
972+
:tm[enu] [menupath] List menu tips. {only in X11, MacVim, and
973+
Win32 GUI}
973974

974975
*:tunmenu* *:tu*
975976
:tu[nmenu] {menupath} Remove a tip for a menu or tool.
976-
{only in X11 and Win32 GUI}
977+
{only in X11, MacVim, and Win32 GUI}
977978

978979
Note: To create menus for terminal mode, use |:tlmenu| instead.
979980

@@ -993,8 +994,9 @@ The tip is defined like this: >
993994
And delete it with: >
994995
:tunmenu MyMenu.Hello
995996
996-
Tooltips are currently only supported for the X11 and Win32 GUI. However, they
997-
should appear for the other gui platforms in the not too distant future.
997+
Tooltips are currently only supported for the X11, MacVim, and Win32 GUI.
998+
However, they should appear for the other gui platforms in the not too distant
999+
future.
9981000

9991001
The ":tmenu" command works just like other menu commands, it uses the same
10001002
arguments. ":tunmenu" deletes an existing menu tip, in the same way as the

runtime/doc/gui_mac.txt

Lines changed: 34 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ These are the non-standard commands that MacVim supports:
124124

125125
*macvim-autocommands*
126126
These are the non-standard events that MacVim supports:
127-
|OSAppearanceChanged|
127+
|OSAppearanceChanged|
128128

129129
*macvim-find*
130130
Whenever you search for something in Vim (e.g. using "/"), or hit <D-e> when
@@ -761,6 +761,8 @@ See the section on |key-mapping| for more help on how to map keys.
761761
==============================================================================
762762
14. International *macvim-international*
763763

764+
Typing text ~
765+
764766
When editing non-English text it may be convenient to keep separate keyboard
765767
layouts for normal and insert mode. This is supported via the 'imd' option on
766768
macOS 10.5 or later (on 10.4 the 'imd' option support is not as useful as it
@@ -779,6 +781,13 @@ set (i.e when IM is enabled). If you find that MacVim switches to the
779781
wrong layout when going back to normal mode, then select the layout you want
780782
to use in normal mode and type ":set imd" followed by ":set noimd".
781783

784+
Translations ~
785+
786+
MacVim uses localized Vim messages (see |multilang-messages|), but there are
787+
MacVim-specific messages that are not currently localized. Please file an
788+
issue if you would like to see certain messages localized. Menus
789+
(|multilang-menus|) are currently not localized in MacVim.
790+
782791
==============================================================================
783792
15. Known bugs/missing features *macvim-todo*
784793

@@ -788,22 +797,24 @@ prominent bugs/missing features.
788797
- Under macOS Mojave (10.14), the default renderer (Core Text renderer) has
789798
some performance issues and scrolling is not as smooth as previous macOS
790799
versions (10.13 or below).
800+
- Sound. MacVim does not currently support |+sound| yet.
801+
- |modifyOtherKeys| support. This feature allows for more granular key
802+
mapping (e.g. differentiating <C-I> and <Tab>) and isn't supported by the
803+
MacVim GUI yet.
791804
- Localized menus are not supported. Choosing anything but "English" in the
792805
"International" pane of "System Prefences" may break the menus (and
793806
toolbar).
794-
- Some Unicode characters are not handled well (e.g. nonspacing marks)
795807
- Sometimes multibyte characters look "too wide", i.e. they overlap the
796808
following character. It might help to change 'ambiwidth', or override the
797809
automatic font substitution by setting 'guifontwide' manually.
798810
- Printing. As a temporary solution <D-p> creates a PostScript file which is
799-
then opened in Preview where it may be printed.
800-
- The toolbar looks ugly and is not very useful.
811+
then opened in Preview where it may be printed. See |hardcopy|.
801812

802-
Other bugs and issues are tracked on Github. If you find new bugs then please
803-
file an issue there: >
813+
Other bugs and issues are tracked on Github. If you find new bugs or have
814+
feature requests then please file an issue there: >
804815
https://github.com/macvim-dev/macvim/issues
805816
806-
There is also a vim_mac mailing list. You can also post your findings of bugs
817+
There is also a vim_mac mailing list. You can also post your findings of bugs
807818
and issues there as well: *vim_mac_group* >
808819
http://groups.google.com/group/vim_mac
809820
@@ -816,6 +827,12 @@ general questions about MacVim.
816827
In this section some general (not necessarily MacVim specific) hints are
817828
given.
818829

830+
Scenario: ~
831+
You would like to remap Caps Lock to Esc.
832+
Solution: ~
833+
Go to System Preferences → Keyboard → Modifier Keys…, and map Caps Lock Key to
834+
Escape.
835+
819836
Scenario: ~
820837
You try opening a bunch of files in tabs but not all files get opened in their
821838
own tab.
@@ -853,11 +870,15 @@ Solution: ~
853870
This is a known problem, see |macvim-todo|.
854871

855872
Scenario: ~
856-
When you click the (green) zoom button you want the window to maximize
857-
horizontally as well as vertically.
873+
When you click the (green) full screen button you want the window to maximize
874+
instead of going full screen. You would also like it to maximize both
875+
horizontally and vertically.
858876
Solution: ~
859-
Hold down Cmd and click the zoom button. If you prefer this to be the default
860-
action, then set the user default MMZoomBoth (see |macvim-prefs|).
877+
Hole down Option, and the full screen button will become the zoom button,
878+
which will by default only maximize vertically.
879+
To maximize in both directions, hold down Cmd and click the zoom button. If
880+
you prefer this to be the default action, then set the user default MMZoomBoth
881+
(see |macvim-prefs|).
861882

862883
Scenario: ~
863884
Typing feels sluggish when the cursor is just before a right bracket (i.e.
@@ -895,18 +916,6 @@ bring up an editor, you would set that option to something like: >
895916
mvim -f -c "au VimLeave * maca hide:"
896917
(See the above Scenario for an explanation of the "-f" switch.)
897918

898-
Scenario: ~
899-
You would like to remap Caps Lock to Esc.
900-
Solution: ~
901-
The app "PCKeyboardHack" can be used to remap Caps Lock. It is available as a
902-
free download from: >
903-
http://pqrs.org/macosx/keyremap4macbook/extra.html
904-
On some Apple keyboards the Caps Lock key doesn't immediately register and
905-
this makes Caps Lock "drop" key presses. To work around this problem go into
906-
the "Keyboard" System Preference and remap Caps Lock to Ctrl first (click the
907-
"Modifier Keys..." button). This trick may also be necessary if the Caps Lock
908-
light turns on/off despite having remapped to Esc.
909-
910919
Scenario: ~
911920
You have problems creating custom mappings involving the Cmd key.
912921
Solution: ~
@@ -921,6 +930,7 @@ Scenario: ~
921930
You can't find the information on MacVim you thought should be in this manual
922931
page.
923932
Solution: ~
924-
Post your question on the |vim_mac| mailing list and wait for an answer.
933+
Post your question on the |vim_mac| mailing list or file an issue at
934+
https://github.com/macvim-dev/macvim/issues.
925935

926936
vim:tw=78:sw=4:ts=8:noet:ft=help:norl:

0 commit comments

Comments
 (0)