From 947fe345c31ea65bbfbc8519b41c51b9c50a8045 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Tue, 29 May 2018 15:34:12 +0200
Subject: [PATCH] Minor, general refactor

In some contexts, map-put is superior to add-to-list.
---
 core/core-ui.el                    | 3 +--
 modules/feature/evil/config.el     | 2 +-
 modules/lang/csharp/config.el      | 2 +-
 modules/lang/org/+babel.el         | 2 +-
 modules/tools/magit/config.el      | 2 +-
 modules/ui/doom-modeline/config.el | 5 ++---
 modules/ui/popup/autoload.el       | 6 +++---
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/core/core-ui.el b/core/core-ui.el
index 166dbfd97..2c8e3d6f6 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -693,8 +693,7 @@ windows, switch to `doom-fallback-buffer'. Otherwise, delegate to original
                        (memq (previous-buffer) (list buf 'nil)))
                (switch-to-buffer (doom-fallback-buffer)))
              (kill-buffer buf)))
-          (t
-           (funcall orig-fn)))))
+          ((funcall orig-fn)))))
 
 
 (defun doom|init-ui ()
diff --git a/modules/feature/evil/config.el b/modules/feature/evil/config.el
index 7fb005d57..8538f206b 100644
--- a/modules/feature/evil/config.el
+++ b/modules/feature/evil/config.el
@@ -16,7 +16,7 @@ variable for an explanation of the defaults (in comments). See
   :defer 1
   :after-call post-command-hook
   :preface
-  ;; must be set before evil/evil-collcetion is loaded
+  ;; must be set before evil/evil-collection is loaded
   (setq evil-want-integration nil
         evil-collection-company-use-tng nil)
   :config
diff --git a/modules/lang/csharp/config.el b/modules/lang/csharp/config.el
index c7ecabe28..ef54fe1c1 100644
--- a/modules/lang/csharp/config.el
+++ b/modules/lang/csharp/config.el
@@ -1,6 +1,6 @@
 ;;; lang/csharp/config.el -*- lexical-binding: t; -*-
 
-(add-to-list 'auto-mode-alist '("\\.shader$" . shader-mode)) ; unity shaders
+(map-put auto-mode-alist '"\\.shader$" 'dshader-mode) ; unity shaders
 
 
 (def-package! omnisharp
diff --git a/modules/lang/org/+babel.el b/modules/lang/org/+babel.el
index 5511bebf0..c4f4cc9d8 100644
--- a/modules/lang/org/+babel.el
+++ b/modules/lang/org/+babel.el
@@ -29,7 +29,7 @@ libraries (ob-*.el) that don't match the name of the language.")
                                   (or (cdr (assoc (downcase language) +org-babel-mode-alist))
                                       language)))
                   nil t))
-        (add-to-list 'org-babel-load-languages (cons lang-sym t)))
+        (map-put org-babel-load-languages lang-sym t))
       (apply orig-fn args)))
   (advice-add #'org-babel-execute-src-block :around #'+org*babel-execute-src-block)
 
diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index 2d1d810f8..67d81c9a4 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -38,7 +38,7 @@
 (def-package! evil-magit
   :when (featurep! :feature evil)
   :after magit
+  :init (setq evil-magit-state 'normal)
   :config
-  (setq evil-magit-state 'normal)
   (map! :map (magit-mode-map magit-blame-read-only-mode-map)
         doom-leader-key nil))
diff --git a/modules/ui/doom-modeline/config.el b/modules/ui/doom-modeline/config.el
index a1209a2b5..cd686e1bb 100644
--- a/modules/ui/doom-modeline/config.el
+++ b/modules/ui/doom-modeline/config.el
@@ -363,7 +363,7 @@ directory, the file name, and its state (modified, read-only or non-existent)."
    (concat (format-mode-line mode-name)
            (when (stringp mode-line-process)
              mode-line-process)
-           (and (featurep 'face-remap)
+           (and (boundp 'text-scale-mode-amount)
                 (/= text-scale-mode-amount 0)
                 (format " (%+d)" text-scale-mode-amount)))
    'face (if (active) 'doom-modeline-buffer-major-mode)))
@@ -495,8 +495,7 @@ lines are selected, or the NxM dimensions of a block selection."
                         (format "%dL" lines))
                        ((> lines 1)
                         (format "%dC %dL" (- end beg) lines))
-                       (t
-                        (format "%dC" (- end beg))))
+                       ((format "%dC" (- end beg))))
                  (when +doom-modeline-enable-word-count
                    (format " %dW" (count-words beg end)))))
        'face 'doom-modeline-highlight))))
diff --git a/modules/ui/popup/autoload.el b/modules/ui/popup/autoload.el
index ddb4995c9..74ce99ee8 100644
--- a/modules/ui/popup/autoload.el
+++ b/modules/ui/popup/autoload.el
@@ -591,11 +591,11 @@ and may be called only if no window on SIDE exists yet."
         ;; Initialize `window-side' parameter of new window to SIDE and
         ;; make that parameter persistent.
         (set-window-parameter window 'window-side side)
-        (add-to-list 'window-persistent-parameters '(window-side . writable))
+        (map-put window-persistent-parameters 'window-side 'writable)
         ;; Install `window-slot' parameter of new window and make that
         ;; parameter persistent.
         (set-window-parameter window 'window-slot slot)
-        (add-to-list 'window-persistent-parameters '(window-slot . writable))
+        (map-put window-persistent-parameters 'window-slot 'writable)
         ;; Auto-adjust height/width of new window unless a size has been
         ;; explicitly requested.
         (unless (if left-or-right
@@ -671,7 +671,7 @@ Accepts the same arguments as `display-buffer-in-side-window'. You must set
                         (lambda (_side) (frame-root-window (selected-frame)))))
                (when-let* ((window (window--make-major-side-window buffer side slot alist)))
                  (set-window-parameter window 'window-vslot vslot)
-                 (add-to-list 'window-persistent-parameters '(window-vslot . writable))
+                 (map-put window-persistent-parameters 'window-vslot 'writable)
                  window)))
             (t
              ;; Scan windows on SIDE.