From 9bc47ca3298b76bd875a4023c1e953051ba04839 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 13 May 2019 19:29:38 -0400
Subject: [PATCH] Minor refactors

- Don't aggressively load gnu-elpa-keyring-update, it autoloads itself
- Update docstring + comments
- scroll-margin = 1
---
 core/core-editor.el   | 2 +-
 core/core-packages.el | 5 +----
 core/core.el          | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/core-editor.el b/core/core-editor.el
index abfe78beb..671d0565d 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -37,7 +37,7 @@ detected.")
  hscroll-margin 2
  hscroll-step 1
  scroll-conservatively 1001
- scroll-margin 2
+ scroll-margin 1
  scroll-preserve-screen-position t
  mouse-wheel-scroll-amount '(5 ((shift) . 2))
  mouse-wheel-progressive-speed nil ; don't accelerate scrolling
diff --git a/core/core-packages.el b/core/core-packages.el
index 5dc6e1247..afb48a873 100644
--- a/core/core-packages.el
+++ b/core/core-packages.el
@@ -43,7 +43,7 @@ package's name as a symbol, and whose CDR is the plist supplied to its
 missing) and shouldn't be deleted.")
 
 (defvar doom-disabled-packages ()
-  "A list of packages that should be ignored by `def-package!'.")
+  "A list of packages that should be ignored by `def-package!' and `after!'.")
 
 ;;; package.el
 (setq package--init-file-ensured t
@@ -67,9 +67,6 @@ missing) and shouldn't be deleted.")
   (dolist (archive package-archives)
     (setcdr archive (replace-regexp-in-string "^https://" "http://" (cdr archive) t nil))))
 
-;; Ensure ELPA's keys are up-to-date (but should we trust this?)
-(require 'gnu-elpa-keyring-update nil t)
-
 ;;; quelpa
 (setq quelpa-dir (expand-file-name "quelpa" doom-packages-dir)
       quelpa-verbose doom-debug-mode
diff --git a/core/core.el b/core/core.el
index 6ba9ffba6..6fc582e77 100644
--- a/core/core.el
+++ b/core/core.el
@@ -196,7 +196,7 @@ Doom was setup, which may cause problems.")
  ;; Don't store authinfo in plain text!
  auth-sources (list (expand-file-name "authinfo.gpg" doom-etc-dir)
                     "~/.authinfo.gpg")
- ;; files
+ ;; Don't litter `doom-emacs-dir'
  abbrev-file-name             (concat doom-local-dir "abbrev.el")
  async-byte-compile-log-file  (concat doom-etc-dir "async-bytecomp.log")
  auto-save-list-file-name     (concat doom-cache-dir "autosave")