From d6cb0ec5f528800ad50d5476038ae3552554d91c Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 22 Dec 2018 04:01:17 -0500
Subject: [PATCH] General cleanup & minor refactoring

---
 core/core-os.el                  | 3 ++-
 modules/emacs/dired/config.el    | 2 +-
 modules/lang/elixir/config.el    | 4 +++-
 modules/lang/haskell/autoload.el | 1 -
 modules/lang/latex/config.el     | 2 +-
 modules/lang/org/+babel.el       | 4 ++--
 modules/lang/sh/config.el        | 2 +-
 modules/tools/ein/config.el      | 4 ++--
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/core-os.el b/core/core-os.el
index ada518047..b0f254903 100644
--- a/core/core-os.el
+++ b/core/core-os.el
@@ -35,7 +35,8 @@
              ;; Curse Lion and its sudden but inevitable fullscreen mode!
              ;; NOTE Meaningless to railwaycat's emacs-mac build
              ns-use-native-fullscreen nil
-             ;; Don't open files from the workspace in a new frame
+             ;; Visit files opened outside of Emacs in existing frame, rather
+             ;; than a new one
              ns-pop-up-frames nil)
 
        ;; Fix the clipboard in terminal or daemon Emacs (non-GUI)
diff --git a/modules/emacs/dired/config.el b/modules/emacs/dired/config.el
index 8933dd30f..2d568e71d 100644
--- a/modules/emacs/dired/config.el
+++ b/modules/emacs/dired/config.el
@@ -47,7 +47,7 @@
       (when (and (not (file-exists-p parent-directory))
                  (y-or-n-p (format "Directory `%s' does not exist! Create it?" parent-directory)))
         (make-directory parent-directory t))))
-  (push #'+dired|create-non-existent-directory find-file-not-found-functions)
+  (add-to-list 'find-file-not-found-functions '+dired|create-non-existent-directory nil #'eq)
 
   ;; Kill buffer when quitting dired buffers
   (define-key dired-mode-map [remap quit-window] (λ! (quit-window t))))
diff --git a/modules/lang/elixir/config.el b/modules/lang/elixir/config.el
index 6792e97cc..f57442ad0 100644
--- a/modules/lang/elixir/config.el
+++ b/modules/lang/elixir/config.el
@@ -3,7 +3,8 @@
 (def-package! elixir-mode
   :defer t
   :init
-  ;; disable default smartparens config
+  ;; Disable default smartparens config; there are too many, they're intrusive
+  ;; and we only want a subset of them (defined below).
   (provide 'smartparens-elixir)
   :config
   ;; ...and only complete the basics
@@ -15,6 +16,7 @@
                      :post-handlers '("||\n[i]"))
       (sp-local-pair "do " " end" :unless '(sp-in-comment-p sp-in-string-p))
       (sp-local-pair "fn " " end" :unless '(sp-in-comment-p sp-in-string-p))))
+
   (set-pretty-symbols! 'elixir-mode
     ;; Functional
     :def "def"
diff --git a/modules/lang/haskell/autoload.el b/modules/lang/haskell/autoload.el
index 9b66e1ae5..f286d0eaa 100644
--- a/modules/lang/haskell/autoload.el
+++ b/modules/lang/haskell/autoload.el
@@ -12,4 +12,3 @@
   "Opens a Haskell REPL."
   (interactive "P")
   (display-buffer (+haskell-repl-buffer arg)))
-
diff --git a/modules/lang/latex/config.el b/modules/lang/latex/config.el
index d7eec47bd..f405b20db 100644
--- a/modules/lang/latex/config.el
+++ b/modules/lang/latex/config.el
@@ -77,7 +77,7 @@ If no viewers are found, `latex-preview-pane' is used.")
                       "\\Bigl\\{" "\\Biggl\\{"
                       "\\lfloor" "\\lceil" "\\langle"
                       "\\lVert" "\\lvert" "`"))
-        (sp-local-pair modes open nil :actions nil))
+        (sp-local-pair modes open nil :actions :rem))
       (sp-local-pair modes "``" nil :unless '(:add sp-in-math-p)))))
 
 
diff --git a/modules/lang/org/+babel.el b/modules/lang/org/+babel.el
index e7d490220..fb4bdb118 100644
--- a/modules/lang/org/+babel.el
+++ b/modules/lang/org/+babel.el
@@ -44,7 +44,7 @@ the first function to return non-nil.")
       t))
   (advice-add #'org-babel-confirm-evaluate :after-while #'+org*babel-lazy-load-library)
 
-  ;; I prefer C-c C-c over C-c '
+  ;; I prefer C-c C-c over C-c ' (more consistent)
   (define-key org-src-mode-map (kbd "C-c C-c") #'org-edit-src-exit)
 
   ;; `org-babel-get-header' was removed from org in 9.0. Quite a few babel
@@ -69,7 +69,7 @@ the first function to return non-nil.")
   (setq ob-ipython-resources-dir ".ob-ipython-resrc")
 
   (defun +org|babel-load-ipython (lang)
-    (and (string-match-p "^jupyter-" (symbol-name lang))
+    (and (string-prefix-p "jupyter-" (symbol-name lang))
          (require 'ob-ipython nil t)))
   (add-hook '+org-babel-load-functions #'+org|babel-load-ipython)
   :config
diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el
index b61562948..f6ae743b7 100644
--- a/modules/lang/sh/config.el
+++ b/modules/lang/sh/config.el
@@ -45,7 +45,7 @@
   (add-hook 'sh-mode-hook #'rainbow-delimiters-mode)
 
   ;; autoclose backticks
-  (sp-local-pair 'sh-mode "`" nil :unless '(sp-point-before-word-p sp-point-before-same-p))
+  (sp-local-pair 'sh-mode "`" "`" :unless '(sp-point-before-word-p sp-point-before-same-p))
 
   ;; sh-mode has file extensions checks for other shells, but not zsh, so...
   (defun +sh|detect-zsh ()
diff --git a/modules/tools/ein/config.el b/modules/tools/ein/config.el
index ab3f6d409..c986cfd71 100644
--- a/modules/tools/ein/config.el
+++ b/modules/tools/ein/config.el
@@ -24,8 +24,8 @@
     ;; Code completion with company
     (setq ein:completion-backend 'ein:use-company-backend)
     (set-company-backend! '(ein:notebook-multilang-mode
-                             ein:notebook-python-mode
-                             ein:notebook-plain-mode)
+                            ein:notebook-python-mode
+                            ein:notebook-plain-mode)
       'ein:company-backend))
 
   (after! ein-jupyter