[elpa] master 302d23f 149/399: counsel.el: Fix org-version testing

[Oleh Krehel]

branch: master
commit 302d23fff1bfd68b6d3de497a1af7a27baa771cb
Author: Basil L. Contovounesios <address@hidden>
Commit: Oleh Krehel <address@hidden>

    counsel.el: Fix org-version testing
    
    (counsel-org-tag-agenda): Use the variable, not interactive
    function, named org-version.  Simplify with cl-letf.
    
    Fixes #2006
    Re: #1997
---
 counsel.el | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/counsel.el b/counsel.el
index b7fea9a..2b64032 100644
--- a/counsel.el
+++ b/counsel.el
@@ -3088,19 +3088,17 @@ otherwise continue prompting for tags."
                 :action #'counsel-org-tag-action
                 :caller 'counsel-org-tag))))
 
+(defvar org-version)
+
 ;;;###autoload
 (defun counsel-org-tag-agenda ()
   "Set tags for the current agenda item."
   (interactive)
-  (let* ((cmd-sym (if (version< (org-version) "9.2")
-                      'org-set-tags
-                    'org-set-tags-command))
-         (store (symbol-function cmd-sym)))
-    (unwind-protect
-         (progn
-           (fset cmd-sym (symbol-function 'counsel-org-tag))
-           (org-agenda-set-tags nil nil))
-      (fset cmd-sym store))))
+  (cl-letf (((symbol-function (if (version< org-version "9.2")
+                                  'org-set-tags
+                                'org-set-tags-command))
+             #'counsel-org-tag))
+    (org-agenda-set-tags)))
 
 (define-obsolete-variable-alias 'counsel-org-goto-display-tags
     'counsel-org-headline-display-tags "0.10.0")
@@ -3232,8 +3230,6 @@ recognized:
   "Go to headline in candidate X."
   (org-goto-marker-or-bmk (cdr x)))
 
-(defvar org-version)
-
 (defun counsel--org-get-heading-args ()
   "Return list of arguments for `org-get-heading'.
 Try to return the right number of arguments for the current Org