Merge pull request #138 from macvim-dev/fix/update_macligatures_option

Update macligatures option

Author: splhack

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*

runtime/doc/options.txt

@@ -4985,31 +4985,31 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'termencoding'.
 	Note: MacVim does not use this option.
 
-				*'macmeta'* *'mmta'* *'nomacmeta'* *'nommta'*
-'macmeta'		boolean	(default off)
-			local to buffer
-			{only available in MacVim GUI}
-	Use option (alt) as meta key.  When on, option-key presses are not
-	interpreted, thus enabling bindings to <M-..>.  When off, option-key
-	presses are interpreted by the selected input method and inserted as
-	text.
-	Note: Some keys (e.g. <M-F1>, <M-Tab>, <M-Return>, <M-Left>) can be
-	bound with the Meta flag even when this option is disabled, but this
-	is not the case for the majority of keys (e.g. <M-a>, <M-`>).
-
 				*'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
+	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
+			{only available in MacVim GUI}
+	Use option (alt) as meta key.  When on, option-key presses are not
+	interpreted, thus enabling bindings to <M-..>.  When off, option-key
+	presses are interpreted by the selected input method and inserted as
+	text.
+	Note: Some keys (e.g. <M-F1>, <M-Tab>, <M-Return>, <M-Left>) can be
+	bound with the Meta flag even when this option is disabled, but this
+	is not the case for the majority of keys (e.g. <M-a>, <M-`>).
+
 						*'magic'* *'nomagic'*
 'magic'			boolean	(default on)
 			global

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"

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'*

runtime/optwin.vim

@@ -651,6 +651,8 @@ if has("gui")
     call <SID>BinOptionG("fullscreen", &fullscreen)
     call append("$", "fuoptions\tcontrol how fullscreen mode should behave")
     call <SID>OptionG("fuoptions", &fuoptions)
+    call append("$", "macligatures\tdisplay ligatures")
+    call <SID>BinOptionG("macligatures", &macligatures)
     call append("$", "macmeta\tuse option as meta key")
     call append("$", "\t(local to buffer)")
     call <SID>BinOptionL("mmta")