From 32a2a2b64df2ecc5471f8f7f08c80693c71c0539 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 3 Jun 2018 15:51:59 +0200
Subject: [PATCH] General, minor refactor

+ Group hooks with add-hook!
+ Sharpquote elfeed call
+ Extract elfeed buffer detector into function and ensure idempotency of
  doom-real-buffer-functions
---
 modules/app/rss/autoload.el   | 2 +-
 modules/app/rss/config.el     | 5 +++--
 modules/lang/python/config.el | 4 ++--
 modules/tools/pdf/config.el   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/app/rss/autoload.el b/modules/app/rss/autoload.el
index 19268ad78..176f253df 100644
--- a/modules/app/rss/autoload.el
+++ b/modules/app/rss/autoload.el
@@ -4,7 +4,7 @@
 (defun =rss ()
   "Activate (or switch to) `elfeed' in its workspace."
   (interactive)
-  (call-interactively 'elfeed))
+  (call-interactively #'elfeed))
 
 ;;;###autoload
 (defun +rss/quit ()
diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el
index 606bbaedf..1de35ecea 100644
--- a/modules/app/rss/config.el
+++ b/modules/app/rss/config.el
@@ -33,8 +33,9 @@ paths.")
   (make-directory elfeed-db-directory t)
 
   ;; Ensure elfeed buffers are treated as real
-  (push (lambda (buf) (string-match-p "^\\*elfeed" (buffer-name buf)))
-        doom-real-buffer-functions)
+  (defun +rss-buffer-p (buf)
+    (string-match-p "^\\*elfeed" (buffer-name buf)))
+  (add-to-list 'doom-real-buffer-functions #'+rss-buffer-p nil #'eq)
 
   ;; Enhance readability of a post
   (add-hook 'elfeed-show-mode-hook #'+rss|elfeed-wrap)
diff --git a/modules/lang/python/config.el b/modules/lang/python/config.el
index 89067bc3e..e51b513a7 100644
--- a/modules/lang/python/config.el
+++ b/modules/lang/python/config.el
@@ -131,5 +131,5 @@ environment variables."
 ;;
 
 (when (featurep! :feature evil +everywhere)
-  (add-hook 'anaconda-mode-hook #'evil-normalize-keymaps)
-  (add-hook 'nose-mode-hook #'evil-normalize-keymaps))
+  (add-hook! '(anaconda-mode-hook nose-mode-hook)
+    #'evil-normalize-keymaps))
diff --git a/modules/tools/pdf/config.el b/modules/tools/pdf/config.el
index 27da28d94..cec7d69d5 100644
--- a/modules/tools/pdf/config.el
+++ b/modules/tools/pdf/config.el
@@ -16,7 +16,7 @@
   ;; Custom modeline that removes useless info and adds page numbers
   (when (featurep! :ui doom-modeline)
     (load! "+modeline")
-    (add-hook! pdf-tools-enabled (doom-set-modeline 'pdf-tools-modeline)))
+    (add-hook! #'pdf-tools-enabled-hook (doom-set-modeline 'pdf-tools-modeline)))
   ;; Handle PDF-tools related popups better
   (set! :popup "^\\*Outline*" '((side . right) (size . 40)) '((select)))
   ;; TODO: Add additional important windows that should be handled differently