From af3b6ee7e03d648f022a9bf7ca59a6954e3dfd9a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sun, 14 May 2017 10:12:41 +0200
Subject: [PATCH] app/rss: revise maps & popup rules

---
 modules/app/rss/autoload.el |  4 ++--
 modules/app/rss/config.el   | 35 +++++++++++++++++++----------------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/modules/app/rss/autoload.el b/modules/app/rss/autoload.el
index 396d56908..83d826a1b 100644
--- a/modules/app/rss/autoload.el
+++ b/modules/app/rss/autoload.el
@@ -40,8 +40,8 @@
     :align +rss-split-direction
     :size 0.75
     :select t
-    :noesc t
-    :autokill t))
+    :autokill t
+    :autoclose t))
 
 ;;;###autoload
 (defun +rss/open (entry)
diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el
index b58253045..ef52e0228 100644
--- a/modules/app/rss/config.el
+++ b/modules/app/rss/config.el
@@ -34,25 +34,28 @@
   (push (lambda (buf) (string-match-p "^\\*elfeed" (buffer-name buf)))
         doom-real-buffer-functions)
 
-  (add-hook! 'elfeed-show-mode-hook
-    #'(doom-hide-modeline-mode +rss|elfeed-wrap))
+  ;; Enhance readability of a post
+  (add-hook 'elfeed-show-mode-hook #'+rss|elfeed-wrap)
 
-  (after! doom-themes
-    (add-hook 'elfeed-show-mode-hook #'doom-buffer-mode))
+  (map! (:map (elfeed-search-mode-map elfeed-show-mode-map)
+          [remap doom/kill-this-buffer] "q"
+          [remap kill-this-buffer]      "q"
+          [remap kill-buffer]           "q")
 
-  (map! :map elfeed-search-mode-map
-        :n "r"   #'elfeed-update
-        :n "s"   #'elfeed-search-live-filter
-        :n "RET" #'elfeed-search-show-entry
-        :n "q"   #'+rss/quit
+        (:map elfeed-search-mode-map
+          :n "q"   #'+rss/quit
+          :n "r"   #'elfeed-update
+          :n "s"   #'elfeed-search-live-filter
+          :n "RET" #'elfeed-search-show-entry)
 
-        :map elfeed-show-mode-map
-        [remap doom/kill-this-buffer] #'elfeed-kill-buffer
-        :n "q"  #'elfeed-kill-buffer
-        :m "j"  #'evil-next-visual-line
-        :m "k"  #'evil-previous-visual-line
-        :n "]b" #'+rss/next
-        :n "[b" #'+rss/previous))
+        (:map elfeed-show-mode-map
+          :n "q"  #'elfeed-kill-buffer
+          :m "j"  #'evil-next-visual-line
+          :m "k"  #'evil-previous-visual-line
+          [remap doom/next-buffer]      #'+rss/next
+          [remap doom/previous-buffer]  #'+rss/previous
+          [remap next-buffer]           #'+rss/next
+          [remap previous-buffer]       #'+rss/previous)))
 
 
 (def-package! elfeed-org