From 2a3e654b1957a0ea6e431e58842cbff9ed2a4d50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rene=CC=81=20Ko=CC=88cher?= <shirk@bitspin.org>
Date: Fri, 13 Nov 2015 20:39:55 +0100
Subject: [PATCH] Add more explanation for the required setup. Make it clear
 that currently ligatures will only draw properly with `cursorline` or
 `relativenumber` enabled.

---
 .../Preferences.nib/designable.nib            |  30 +++++++++---------
 .../Preferences.nib/keyedobjects.nib          | Bin 15893 -> 15738 bytes
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib
index 61719b6784..4362f201e4 100644
--- a/src/MacVim/English.lproj/Preferences.nib/designable.nib
+++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="8152.3" systemVersion="15A216g" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9059" systemVersion="15C31f" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment version="1050" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8152.3"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9059"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MMPreferenceController">
@@ -192,11 +192,11 @@
             <animations/>
         </customView>
         <customView id="620" userLabel="Advanced">
-            <rect key="frame" x="0.0" y="0.0" width="483" height="381"/>
+            <rect key="frame" x="0.0" y="0.0" width="483" height="407"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <textField verticalHuggingPriority="750" id="826">
-                    <rect key="frame" x="17" y="170" width="449" height="56"/>
+                    <rect key="frame" x="17" y="173" width="449" height="56"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="993">
@@ -207,7 +207,7 @@
                     </textFieldCell>
                 </textField>
                 <button id="817">
-                    <rect key="frame" x="18" y="228" width="133" height="18"/>
+                    <rect key="frame" x="18" y="231" width="133" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <buttonCell key="cell" type="check" title="Enable Quickstart" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="992">
@@ -220,7 +220,7 @@
                     </connections>
                 </button>
                 <textField verticalHuggingPriority="750" id="815">
-                    <rect key="frame" x="17" y="315" width="449" height="28"/>
+                    <rect key="frame" x="17" y="341" width="449" height="28"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="991">
@@ -231,18 +231,18 @@
                     </textFieldCell>
                 </textField>
                 <textField verticalHuggingPriority="750" id="UsV-sz-DPX">
-                    <rect key="frame" x="38" y="257" width="423" height="28"/>
+                    <rect key="frame" x="38" y="255" width="423" height="56"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="v4V-eb-KHB">
                         <font key="font" metaFont="smallSystem"/>
-                        <string key="title">Selecting this option will enable full support for displaying font ligatures. Using this with a non-proportional font may result in layout issues.</string>
+                        <string key="title">Selecting this option will enable full support for displaying font ligatures. Using this with a non-proportional font may result in layout issues. Please note that liguture support currenty requires 'set cursorline' or 'set relativenumber' to draw properly.</string>
                         <color key="textColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
                 <button id="782">
-                    <rect key="frame" x="18" y="345" width="174" height="18"/>
+                    <rect key="frame" x="18" y="371" width="174" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <buttonCell key="cell" type="check" title="Use Core Text renderer" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="990">
@@ -255,7 +255,7 @@
                     </connections>
                 </button>
                 <button id="Y9N-gx-Zgy">
-                    <rect key="frame" x="38" y="291" width="191" height="18"/>
+                    <rect key="frame" x="38" y="317" width="191" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <buttonCell key="cell" type="check" title="Enable support for ligatures" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="fZO-bR-PtE">
@@ -268,7 +268,7 @@
                     </connections>
                 </button>
                 <textField verticalHuggingPriority="750" id="1001">
-                    <rect key="frame" x="17" y="74" width="444" height="70"/>
+                    <rect key="frame" x="17" y="77" width="444" height="70"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="1004">
@@ -279,7 +279,7 @@
                     </textFieldCell>
                 </textField>
                 <button id="1013">
-                    <rect key="frame" x="18" y="146" width="174" height="18"/>
+                    <rect key="frame" x="18" y="149" width="174" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <buttonCell key="cell" type="check" title="Draw marked text inline" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="1014">
@@ -291,7 +291,7 @@
                     </connections>
                 </button>
                 <textField verticalHuggingPriority="750" id="1017">
-                    <rect key="frame" x="17" y="20" width="415" height="28"/>
+                    <rect key="frame" x="17" y="23" width="415" height="28"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" id="1020">
@@ -302,7 +302,7 @@
                     </textFieldCell>
                 </textField>
                 <button id="1028">
-                    <rect key="frame" x="18" y="50" width="388" height="18"/>
+                    <rect key="frame" x="18" y="53" width="388" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <animations/>
                     <buttonCell key="cell" type="check" title="Prefer native full-screen support (requires Mac OS X 10.7)" bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="1029">
@@ -315,7 +315,7 @@
                 </button>
             </subviews>
             <animations/>
-            <point key="canvasLocation" x="592.5" y="797.5"/>
+            <point key="canvasLocation" x="592.5" y="810.5"/>
         </customView>
     </objects>
 </document>
diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib
index b019497a60131cacbbcd11a5f09f2a891d8c3db8..ca8cc01ea0d8b0f74d1f5789349cdd5c24c81d32 100644
GIT binary patch
delta 7460
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
C-+;mZ

delta 7643
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
K-*?~P4gUkGXwMq}