diff --git a/runtime/doc/gui_mac.txt b/runtime/doc/gui_mac.txt index 012c2a0031..24b4b3fea1 100644 --- a/runtime/doc/gui_mac.txt +++ b/runtime/doc/gui_mac.txt @@ -111,7 +111,7 @@ to your .gvimrc file to revert back to the default Vim tab label. *macvim-options* These are the non-standard options that MacVim supports: 'antialias' 'blurradius' 'fullscreen' - 'fuoptions' 'macmeta' 'macligatures' 'toolbariconsize' + 'fuoptions' 'macligatures' 'macmeta' 'toolbariconsize' 'transparency' *macvim-commands* diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index ad18ef396d..2510a7212f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -4985,6 +4985,19 @@ A jump table for the options with a short description can be found at |Q_op|. 'termencoding'. Note: MacVim does not use this option. + *'macligatures'* *'nomacligatures'* +'macligatures' boolean (default off) + global + {not in Vi} + {only available when compiled with GUI enabled on + Mac OS X} + This option only has an effect in the GUI version of Vim on Mac OS X + v10.5 or later. When on, Vim will display ligatures if the selected + 'guifont' supports them. Examples for such fonts are Fira Code or + Haskelig. + Note: Currently this option only has an effect if + 'Use Core Text renderer' is enabled in the GUI preferences pane. + *'macmeta'* *'mmta'* *'nomacmeta'* *'nommta'* 'macmeta' boolean (default off) local to buffer @@ -4997,19 +5010,6 @@ A jump table for the options with a short description can be found at |Q_op|. bound with the Meta flag even when this option is disabled, but this is not the case for the majority of keys (e.g. , ). - *'macligatures'* *'nomacligatures'* -'macligatures' boolean (default off) - global - {not in Vi} - {only available when compiled with GUI enabled on - Mac OS X} - This option only has an effect in the GUI version of Vim on Mac OS X - v10.2 or later. When on, Vim will display ligatures if the selected - 'guifont' supports them. Examples for such fonts are Fira Code or - Haskelig. - Note: Currently this option only has an effect if - 'Use Core Text renderer' is enabled in the GUI preferences pane. - *'magic'* *'nomagic'* 'magic' boolean (default on) global diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index 367506541b..f50470a82d 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -782,6 +782,7 @@ Short explanation of each option: *option-list* 'loadplugins' 'lpl' load plugin scripts when starting up 'luadll' name of the Lua dynamic library 'macatsui' Mac GUI: use ATSUI text drawing +'macligatures' display ligatures (MacVim GUI only) 'macmeta' 'mmta' use option as meta key (MacVim GUI only) 'magic' changes special characters in search patterns 'makeef' 'mef' name of the errorfile for ":make" diff --git a/runtime/doc/tags b/runtime/doc/tags index f71fd466b7..a11678f07b 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -426,6 +426,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'lz' options.txt /*'lz'* 'ma' options.txt /*'ma'* 'macatsui' options.txt /*'macatsui'* +'macligatures' options.txt /*'macligatures'* 'macmeta' options.txt /*'macmeta'* 'magic' options.txt /*'magic'* 'makeef' options.txt /*'makeef'* @@ -602,6 +603,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME* 'nolz' options.txt /*'nolz'* 'noma' options.txt /*'noma'* 'nomacatsui' options.txt /*'nomacatsui'* +'nomacligatures' options.txt /*'nomacligatures'* 'nomacmeta' options.txt /*'nomacmeta'* 'nomagic' options.txt /*'nomagic'* 'nomh' options.txt /*'nomh'* diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 9257d82641..4757944729 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -651,6 +651,8 @@ if has("gui") call BinOptionG("fullscreen", &fullscreen) call append("$", "fuoptions\tcontrol how fullscreen mode should behave") call OptionG("fuoptions", &fuoptions) + call append("$", "macligatures\tdisplay ligatures") + call BinOptionG("macligatures", &macligatures) call append("$", "macmeta\tuse option as meta key") call append("$", "\t(local to buffer)") call BinOptionL("mmta")