From 1a923441ff7b67410572e8f390b1f32f4e7a66be Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 29 Jun 2018 13:59:07 +0200 Subject: [PATCH] Fix infinite-recursion when killing elfeed buffers --- modules/app/rss/autoload.el | 2 +- modules/app/rss/config.el | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/app/rss/autoload.el b/modules/app/rss/autoload.el index ce89ef798..c96a5fbda 100644 --- a/modules/app/rss/autoload.el +++ b/modules/app/rss/autoload.el @@ -11,7 +11,7 @@ "TODO" (interactive) (elfeed-db-compact) - (doom-kill-matching-buffers "^\\*elfeed") + (doom-kill-matching-buffers "^\\*elfeed" (delq (current-buffer) (buffer-list))) (dolist (file +rss-elfeed-files) (when-let* ((buf (get-file-buffer (expand-file-name file org-directory)))) (kill-buffer buf)))) diff --git a/modules/app/rss/config.el b/modules/app/rss/config.el index ffb1d2774..898d14ef3 100644 --- a/modules/app/rss/config.el +++ b/modules/app/rss/config.el @@ -39,7 +39,7 @@ absolute paths.") ;; Enhance readability of a post (add-hook 'elfeed-show-mode-hook #'+rss|elfeed-wrap) - (add-hook! '(elfeed-show-mode-hook elfeed-search-mode-hook) + (add-hook! 'elfeed-search-mode-hook (add-hook 'kill-buffer-hook #'+rss/quit nil t)) ;; Keybindings @@ -49,10 +49,9 @@ absolute paths.") [remap previous-buffer] #'+rss/previous)) (when (featurep! :feature evil +everywhere) (evil-define-key 'normal elfeed-search-mode-map - "q" #'kill-this-buffer - "r" #'elfeed-update - "s" #'elfeed-search-live-filter - (kbd "RET") #'elfeed-search-show-entry + "q" #'elfeed-kill-buffer + "r" #'elfeed-update + (kbd "RET") #'elfeed-search-show-entry (kbd "M-RET") #'elfeed-search-browse-url) (evil-define-key 'normal elfeed-show-mode-map "q" #'elfeed-kill-buffer)