Merge branch 'bugfix' GH-438

VimR/AppearancePref.swift

@@ -99,7 +99,10 @@ class AppearancePref: PrefPane, NSComboBoxDelegate, NSControlTextEditingDelegate
     fontPopup.action = #selector(AppearancePref.fontPopupAction)
 
     // This takes approx. 0.8s - 1s on my machine... -_-
-    fontPopup.addItems(withTitles: self.fontManager.availableFontNames(with: .fixedPitchFontMask)!)
+    DispatchQueue.global(qos: .background).async {
+      fontPopup.addItems(withTitles: self.fontManager.availableFontNames(with: .fixedPitchFontMask)!)
+      self.updateViews()
+    }
 
     let sizeCombo = self.sizeCombo
     sizeCombo.delegate = self

VimR/UiRoot.swift

@@ -20,12 +20,7 @@ class UiRoot: UiComponent {
 
     self.fileMonitor = FileMonitor(source: source, emitter: emitter, state: state)
     self.openQuicklyWindow = OpenQuicklyWindow(source: source, emitter: emitter, state: state)
-
-    // We dispatch the initialization of the pref window in the background since the population of the font list
-    // in the appearance pref pane takes approx. 0.8s - 1s on my machine... -_-
-    DispatchQueue.global(qos: .background).async {
-      self.prefWindow = PrefWindow(source: source, emitter: emitter, state: state)
-    }
+    self.prefWindow = PrefWindow(source: source, emitter: emitter, state: state)
 
     source
       .observeOn(MainScheduler.instance)
@@ -54,7 +49,7 @@ class UiRoot: UiComponent {
 
   fileprivate let fileMonitor: FileMonitor
   fileprivate let openQuicklyWindow: OpenQuicklyWindow
-  fileprivate var prefWindow: PrefWindow?
+  fileprivate let prefWindow: PrefWindow
 
   fileprivate var mainWindows = [String: MainWindow]()
   fileprivate var subjectForMainWindows = [String: PublishSubject<MainWindow.State>]()

bin/build_vimr.sh

@@ -17,11 +17,11 @@ pushd neovim
 ln -f -s ../local.mk .
 
 rm -rf build
-make clean
+make distclean
 
 echo "### Building nvim to get the runtime folder"
+rm -rf /tmp/nvim
 make CMAKE_FLAGS="-DCUSTOM_UI=0 -DCMAKE_INSTALL_PREFIX=/tmp/nvim" install
-cp -r /tmp/nvim/share/nvim/runtime .
 
 rm -rf build
 make clean
@@ -29,6 +29,10 @@ make clean
 echo "### Building libnvim"
 make libnvim
 
+echo "### Copying runtime"
+rm -rf runtime
+cp -r /tmp/nvim/share/nvim/runtime .
+
 popd
 
 echo "### Updating carthage"