diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib
index 83fcd54b7d..412b930a7f 100644
--- a/src/MacVim/English.lproj/Preferences.nib/designable.nib
+++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib
@@ -1,276 +1,1704 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This applies to files opened from the Finder (e.g. by double-clicking on a file or by dragging a file onto the MacVim dock icon) or from external programs such as Xcode.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- New windows open instantaneously with Quickstart enabled but they may not have the latest runtime files sourced. If you modify your runtime files (e.g files inside the ~/.vim directory) then you may need to disable and re-enable Quickstart to ensure that the next window you open will pick up on those changes.
-
-
-
-
-
-
-
-
-
-
- Selecting this option will increase rendering performance but double-tapping with three fingers to look up words will no longer work.
-
-
-
-
-
-
-
-
-
-
- This option causes marked text to be rendered like normal text which is very convenient when using a complex input method (e.g. Kotoeri). However, it has some known limitations which may be circumvented by disabling this option (e.g. mapping to "dead keys" may not work). Note that without this option the Core Text renderer will not draw marked text at all.
-
-
-
-
-
-
-
-
-
-
- You may want to disable this option when using multiple monitors since the native full-screen support renders secondary monitors useless.
-
-
-
-
-
-
-
-
-
+
+
+
+ 1060
+ 10K549
+ 1938
+ 1038.36
+ 461.00
+
+
+ NSPopUpButton
+ NSButton
+ NSMenu
+ NSTextFieldCell
+ NSButtonCell
+ NSMenuItem
+ NSMatrix
+ NSCustomView
+ NSCustomObject
+ NSPopUpButtonCell
+ NSUserDefaultsController
+ NSTextField
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+
+
+
+
+
+ 268
+
+
+
+ 268
+ {{18, 50}, {388, 18}}
+
+
+
+ YES
+
+ -2080374784
+ 0
+ Prefer native full-screen support (requires Mac OS X 10.7)
+
+
+ 1211912448
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 268
+ {{17, 20}, {415, 28}}
+
+
+ YES
+
+ 67108864
+ 272760832
+ You may want to disable this option when using multiple monitors since the native full-screen support renders secondary monitors useless.
+
+
+
+
+ 3
+ MC41AA
+
+
+
+
+
+ 268
+ {{18, 146}, {174, 18}}
+
+
+
+ YES
+
+ 67108864
+ 0
+ Draw marked text inline
+
+
+ 1211912448
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 268
+ {{17, 74}, {444, 70}}
+
+
+
+ YES
+
+ 67108864
+ 272760832
+ This option causes marked text to be rendered like normal text which is very convenient when using a complex input method (e.g. Kotoeri). However, it has some known limitations which may be circumvented by disabling this option (e.g. mapping to "dead keys" may not work). Note that without this option the Core Text renderer will not draw marked text at all.
+
+
+
+
+
+
+
+
+ 268
+ {{18, 282}, {174, 18}}
+
+
+
+ YES
+
+ 67108864
+ 0
+ Use Core Text renderer
+
+
+ 1211912448
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 268
+ {{17, 252}, {449, 28}}
+
+
+
+ YES
+
+ 67108864
+ 272760832
+ Selecting this option will increase rendering performance but double-tapping with three fingers to look up words will no longer work.
+
+
+
+
+
+
+
+
+ 268
+ {{18, 228}, {133, 18}}
+
+
+
+ YES
+
+ 67108864
+ 0
+ Enable Quickstart
+
+
+ 1211912448
+ 2
+
+
+
+
+ 200
+ 25
+
+
+
+
+ 268
+ {{17, 170}, {449, 56}}
+
+
+
+ YES
+
+ 67108864
+ 272760832
+ New windows open instantaneously with Quickstart enabled but they may not have the latest runtime files sourced. If you modify your runtime files (e.g files inside the ~/.vim directory) then you may need to disable and re-enable Quickstart to ensure that the next window you open will pick up on those changes.
+
+
+
+
+ 3
+ MC41AA
+
+ 2
+
+
+
+
+
+ {483, 318}
+
+
+
+ NSView
+
+
+
+
+
+
+ generalPreferences
+
+
+
+ 143
+
+
+
+ openInCurrentWindowSelectionChanged:
+
+
+
+ 572
+
+
+
+ layoutPopUpButton
+
+
+
+ 596
+
+
+
+ advancedPreferences
+
+
+
+ 632
+
+
+
+ quickstartButtonClicked:
+
+
+
+ 858
+
+
+
+ atsuiButtonClicked:
+
+
+
+ 892
+
+
+
+ selectedTag: values.MMUntitledWindow
+
+
+
+
+
+ selectedTag: values.MMUntitledWindow
+ selectedTag
+ values.MMUntitledWindow
+ 2
+
+
+ 171
+
+
+
+ selectedTag: values.MMOpenInCurrentWindow
+
+
+
+
+
+ selectedTag: values.MMOpenInCurrentWindow
+ selectedTag
+ values.MMOpenInCurrentWindow
+ 2
+
+
+ 520
+
+
+
+ value: values.SUCheckAtStartup
+
+
+
+
+
+ value: values.SUCheckAtStartup
+ value
+ values.SUCheckAtStartup
+ 2
+
+
+ 169
+
+
+
+ selectedTag: values.MMOpenLayout
+
+
+
+
+
+ selectedTag: values.MMOpenLayout
+ selectedTag
+ values.MMOpenLayout
+ 2
+
+
+ 441
+
+
+
+ enabled: values.MMOpenInCurrentWindow
+
+
+
+
+
+ enabled: values.MMOpenInCurrentWindow
+ enabled
+ values.MMOpenInCurrentWindow
+
+ NSValueTransformerName
+ NSNegateBoolean
+
+ 2
+
+
+ 546
+
+
+
+ value: values.MMRenderer
+
+
+
+
+
+ value: values.MMRenderer
+ value
+ values.MMRenderer
+ 2
+
+
+ 1000
+
+
+
+ value: values.MMPreloadCacheSize
+
+
+
+
+
+ value: values.MMPreloadCacheSize
+ value
+ values.MMPreloadCacheSize
+ 2
+
+
+ 828
+
+
+
+ selectedIndex: values.MMLastWindowClosedBehavior
+
+
+
+
+
+ selectedIndex: values.MMLastWindowClosedBehavior
+ selectedIndex
+ values.MMLastWindowClosedBehavior
+ 2
+
+
+ 968
+
+
+
+ value: values.MMUseInlineIm
+
+
+
+
+
+ value: values.MMUseInlineIm
+ value
+ values.MMUseInlineIm
+ 2
+
+
+ 1016
+
+
+
+ value: values.MMNativeFullScreen
+
+
+
+
+
+ value: values.MMNativeFullScreen
+ value
+ values.MMNativeFullScreen
+ 2
+
+
+ 1031
+
+
+
+
+
+ 0
+
+
+
+
+
+ -2
+
+
+ File's Owner
+
+
+ -1
+
+
+ First Responder
+
+
+ -3
+
+
+ Application
+
+
+ 58
+
+
+ Shared Defaults
+
+
+ 115
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ General
+
+
+ 116
+
+
+
+
+
+
+
+ 117
+
+
+
+
+
+
+
+ 119
+
+
+
+
+
+
+
+
+
+
+ 137
+
+
+
+
+ 138
+
+
+
+
+ 139
+
+
+
+
+ 120
+
+
+
+
+
+
+
+
+
+ 134
+
+
+
+
+ 135
+
+
+
+
+ 121
+
+
+
+
+
+
+
+ 122
+
+
+
+
+
+
+
+ 124
+
+
+
+
+
+
+
+ 126
+
+
+
+
+
+
+
+ 427
+
+
+
+
+
+
+
+ 957
+
+
+
+
+
+
+
+ 620
+
+
+
+
+
+
+
+
+
+
+
+
+ Advanced
+
+
+ 782
+
+
+
+
+
+
+
+ 815
+
+
+
+
+
+
+
+ 817
+
+
+
+
+
+
+
+ 826
+
+
+
+
+
+
+
+ 972
+
+
+
+
+ 973
+
+
+
+
+ 974
+
+
+
+
+ 975
+
+
+
+
+ 976
+
+
+
+
+ 977
+
+
+
+
+ 978
+
+
+
+
+
+
+
+ 979
+
+
+
+
+
+
+
+ 990
+
+
+
+
+ 991
+
+
+
+
+ 992
+
+
+
+
+ 993
+
+
+
+
+ 996
+
+
+
+
+ 997
+
+
+
+
+ 429
+
+
+
+
+
+
+
+
+
+
+ 544
+
+
+
+
+ 436
+
+
+
+
+ 431
+
+
+
+
+ 430
+
+
+
+
+ 959
+
+
+
+
+
+
+
+
+
+ 962
+
+
+
+
+ 961
+
+
+
+
+ 960
+
+
+
+
+ 1001
+
+
+
+
+
+
+
+ 1004
+
+
+
+
+ 1013
+
+
+
+
+
+
+
+ 1014
+
+
+
+
+ 1017
+
+
+
+
+
+
+
+ 1020
+
+
+
+
+ 1028
+
+
+
+
+
+
+
+ 1029
+
+
+
+
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+
+
+
+
+ 1031
+
+
+
+
+ DBPrefsWindowController
+ NSWindowController
+
+ IBProjectSource
+ ./Classes/DBPrefsWindowController.h
+
+
+
+ FirstResponder
+
+ id
+ id
+ id
+
+
+
+ atsuiButtonClicked:
+ id
+
+
+ loginShellButtonClicked:
+ id
+
+
+ quickstartButtonClicked:
+ id
+
+
+
+ IBUserSource
+
+
+
+
+ MMPreferenceController
+ DBPrefsWindowController
+
+ openInCurrentWindowSelectionChanged:
+ id
+
+
+ openInCurrentWindowSelectionChanged:
+
+ openInCurrentWindowSelectionChanged:
+ id
+
+
+
+ NSView
+ NSView
+ NSPopUpButton
+
+
+
+ advancedPreferences
+ NSView
+
+
+ generalPreferences
+ NSView
+
+
+ layoutPopUpButton
+ NSPopUpButton
+
+
+
+ IBProjectSource
+ ./Classes/MMPreferenceController.h
+
+
+
+
+ 0
+ IBCocoaFramework
+
+ com.apple.InterfaceBuilder.CocoaPlugin.macosx
+
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3
+
+
+ YES
+ 3
+
+ {9, 8}
+ {7, 2}
+ {15, 15}
+
+
+
diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib
index cd0271eebc..1a417e3285 100644
Binary files a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib and b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib differ