From a201409fdd3885a986c90f782deceedd1e3a9594 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 10 Jul 2019 21:27:12 +0200
Subject: [PATCH] Minor refactors across the board

---
 modules/completion/ivy/config.el             | 14 ++++----------
 modules/editor/snippets/autoload/snippets.el |  2 +-
 modules/lang/clojure/config.el               |  2 +-
 modules/lang/emacs-lisp/autoload.el          |  3 +--
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/modules/completion/ivy/config.el b/modules/completion/ivy/config.el
index bf93ee4f2..bdbc6e9f8 100644
--- a/modules/completion/ivy/config.el
+++ b/modules/completion/ivy/config.el
@@ -271,10 +271,10 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
   :hook (ivy-mode . ivy-posframe-mode)
   :config
   (setq ivy-fixed-height-minibuffer nil
+        ivy-posframe-border-width 10
         ivy-posframe-parameters
         `((min-width . 90)
-          (min-height . ,ivy-height)
-          (internal-border-width . 10)))
+          (min-height . ,ivy-height)))
 
   ;; default to posframe display function
   (setf (alist-get t ivy-posframe-display-functions-alist) #'+ivy-display-at-frame-center-near-bottom)
@@ -289,14 +289,8 @@ evil-ex-specific constructs, so we disable it solely in evil-ex."
              (not (featurep! +prescient)))
   :defer t  ; is loaded by ivy
   :init
-  (setq ivy-re-builders-alist
-        '((counsel-ag . ivy--regex-plus)
-          (counsel-rg . ivy--regex-plus)
-          (counsel-grep . ivy--regex-plus)
-          (swiper . ivy--regex-plus)
-          (swiper-isearch . ivy--regex-plus)
-          (t . ivy--regex-fuzzy))
-        ivy-initial-inputs-alist nil
+  (setf (alist-get 't ivy-re-builders-alist) #'ivy--regex-fuzzy)
+  (setq ivy-initial-inputs-alist nil
         ivy-flx-limit 10000))
 
 
diff --git a/modules/editor/snippets/autoload/snippets.el b/modules/editor/snippets/autoload/snippets.el
index c9da893da..8e227513a 100644
--- a/modules/editor/snippets/autoload/snippets.el
+++ b/modules/editor/snippets/autoload/snippets.el
@@ -18,7 +18,7 @@ you will be prompted to select one.
 
 If there are conflicting keys across the two camps, the built-in ones are
 ignored. This makes it easy to override built-in snippets with private ones."
-  (when (memq this-command '(yas-expand +snippets/expand-on-region))
+  (when (eq this-command 'yas-expand)
     (let* ((gc-cons-threshold doom-gc-cons-upper-limit)
            (choices (cl-remove-duplicates choices :test #'+snippets--remove-p)))
       (if (cdr choices)
diff --git a/modules/lang/clojure/config.el b/modules/lang/clojure/config.el
index d65903646..d6cf9e32c 100644
--- a/modules/lang/clojure/config.el
+++ b/modules/lang/clojure/config.el
@@ -1,6 +1,6 @@
 ;;; lang/clojure/config.el -*- lexical-binding: t; -*-
 
-;; `clojure-mode'
+;;;###package clojure-mode
 (add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
 
 
diff --git a/modules/lang/emacs-lisp/autoload.el b/modules/lang/emacs-lisp/autoload.el
index c846dec60..48dd9a7b9 100644
--- a/modules/lang/emacs-lisp/autoload.el
+++ b/modules/lang/emacs-lisp/autoload.el
@@ -24,8 +24,7 @@ to a pop up buffer."
       (setq-local scroll-margin 0)
       (let (emacs-lisp-mode-hook)
         (emacs-lisp-mode))
-      (prin1 result buf)
-      (pp-buffer)
+      (pp result buf)
       (let ((lines (count-lines (point-min) (point-max))))
         (if (> lines 1)
             (save-selected-window