branch: elpa/elfeed
commit d6b0dffdfb1df33bdad654a2afe1b3833fabf056
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Extract elfeed-search--prompt-tag, check for empty tag
---
elfeed-search.el | 15 +++++++++------
elfeed-show.el | 2 +-
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/elfeed-search.el b/elfeed-search.el
index e3fab7448b..2d2cbbee53 100644
--- a/elfeed-search.el
+++ b/elfeed-search.el
@@ -922,10 +922,15 @@ the browser defined by
`browse-url-secondary-browser-function'."
(mapc #'elfeed-search-update-entry entries)
(elfeed-search--after-action 'yank))))
+(defun elfeed-search--prompt-tag ()
+ "Prompt for tag in the minibuffer."
+ (let ((tag (read-from-minibuffer "Tag: ")))
+ (when (equal tag "") (user-error "No tag given!"))
+ (intern tag)))
+
(defun elfeed-search-tag-all (tag)
"Apply TAG to all selected entries."
- (interactive (list (intern (read-from-minibuffer "Tag: ")))
- elfeed-search-mode)
+ (interactive (list (elfeed-search--prompt-tag)) elfeed-search-mode)
(let ((entries (elfeed-search-selected)))
(elfeed-tag entries tag)
(mapc #'elfeed-search-update-entry entries)
@@ -933,8 +938,7 @@ the browser defined by
`browse-url-secondary-browser-function'."
(defun elfeed-search-untag-all (tag)
"Remove TAG from all selected entries."
- (interactive (list (intern (read-from-minibuffer "Tag: ")))
- elfeed-search-mode)
+ (interactive (list (elfeed-search--prompt-tag)) elfeed-search-mode)
(let ((entries (elfeed-search-selected)))
(elfeed-untag entries tag)
(mapc #'elfeed-search-update-entry entries)
@@ -942,8 +946,7 @@ the browser defined by
`browse-url-secondary-browser-function'."
(defun elfeed-search-toggle-all (tag)
"Toggle TAG on all selected entries."
- (interactive (list (intern (read-from-minibuffer "Tag: ")))
- elfeed-search-mode)
+ (interactive (list (elfeed-search--prompt-tag)) elfeed-search-mode)
(let ((entries (elfeed-search-selected)) entries-tag entries-untag)
(cl-loop for entry in entries
when (elfeed-tagged-p tag entry)
diff --git a/elfeed-show.el b/elfeed-show.el
index b9fe6aceaf..59f0a5d105 100644
--- a/elfeed-show.el
+++ b/elfeed-show.el
@@ -307,7 +307,7 @@ the browser defined by
`browse-url-secondary-browser-function'."
(defun elfeed-show-tag (&rest tags)
"Add TAGS to the displayed entry."
- (interactive (list (intern (read-from-minibuffer "Tag: "))) elfeed-show-mode)
+ (interactive (list (elfeed-search--prompt-tag)) elfeed-show-mode)
(let ((entry elfeed-show-entry))
(apply #'elfeed-tag entry tags)
(with-current-buffer (elfeed-search-buffer)
