1 files changed, 17 insertions, 13 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index 80cb06d..7aa864f 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -726,7 +726,7 @@ point whilst I’m moving about.
         mouse-wheel-scroll-amount '(1 ((shift) . 1) ((control)))
         split-height-threshold 100
         frame-resize-pixelwise t)
-  (if (eq system-type 'darwin)
+  (if (boundp 'ns-pop-up-frames)
       (setq ns-pop-up-frames nil))
 #+END_SRC
 
@@ -871,8 +871,9 @@ Sometimes I want to insert a date or time into a buffer.
               (add-hook 'osx-location-changed-hook
                         (lambda ()
                           (setq calendar-latitude osx-location-latitude
-                                calendar-longitude osx-location-longitude
-                                calendar-location-name (format "%s, %s" osx-location-latitude osx-location-longitude))))
+                                calendar-longitude osx-location-longitude)
+                          (when (featurep 'solar)
+                            calendar-location-name (format "%s, %s" osx-location-latitude osx-location-longitude))))
               (osx-location-watch)))
 #+END_SRC
 
@@ -1045,15 +1046,16 @@ re-arrangement of modifiers on OSX: Cmd on the outside, then
 Option/alt, then Control.
 
 #+BEGIN_SRC emacs-lisp
-(when (eq system-type 'darwin)
-  (set-keyboard-coding-system nil)
-  (setq mac-option-modifier 'meta
-        mac-right-option-modifier 'left
-        mac-control-modifier 'control
-        mac-right-control-modifier 'left
-        mac-command-modifier 'super
-        mac-right-command-modifier 'left
-        mac-function-modifier 'hyper))
+  (when (eq system-type 'darwin)
+    (set-keyboard-coding-system nil)
+    (custom-set-variables
+     '(mac-option-modifier 'meta)
+     '(mac-right-option-modifier 'left)
+     '(mac-control-modifier 'control)
+     '(mac-right-control-modifier 'left)
+     '(mac-command-modifier 'super)
+     '(mac-right-command-modifier 'left)
+     '(mac-function-modifier 'hyper)))
 #+END_SRC
 
 #+BEGIN_SRC emacs-lisp
@@ -1822,7 +1824,7 @@ A REPL thing for Clojure
   :config (progn
             (setq nrepl-hide-special-buffers t)
             (unbind-key "C-c C-f" cider-mode-map)
-            (add-hook 'cider-mode-hook #'cider-turn-on-eldoc-mode)))
+            (add-hook 'cider-mode-hook #'eldoc-mode)))
 #+END_SRC
 
 ** Auto-compile
@@ -1873,6 +1875,7 @@ it though
 #+BEGIN_SRC emacs-lisp
   (req-package js2-mode
     :mode ("\\.js\\'" . js2-mode)
+    :functions js2-next-error
     :config (progn
               (defun ap/javascript-setup ()
                 (auto-indent-mode -1))
@@ -2379,6 +2382,7 @@ the =org=-document after changes.
 
 #+BEGIN_SRC emacs-lisp
   (req-package async
+    :commands (async-start)
     :defer 2)
 
   (defun tangle-init ()