[elpa] master bec310f 1/2: Quick fix for handle finders.

[Ian Dunn]

branch: master
commit bec310f1a793e58bfd31a12a612e7ffe931505d0
Author: Ian Dunn <address@hidden>
Commit: Ian Dunn <address@hidden>

    Quick fix for handle finders.
    
    Attempt to expand empty argument list resulted in calling `quote' with no
    arguments.
    
    * org-edna.el (org-edna--handle-finder): Pass arguments as a list.
      (org-edna--expand-single-sexp-form): Don't expand arguments.
---
 org-edna-tests.el |  20 +++----
 org-edna.el       |   6 +--
 org-edna.info     | 157 +++++++++++++++++++++++++++++-------------------------
 org-edna.org      |   3 +-
 4 files changed, 99 insertions(+), 87 deletions(-)

diff --git a/org-edna-tests.el b/org-edna-tests.el
index 890ddd9..da766a9 100644
--- a/org-edna-tests.el
+++ b/org-edna-tests.el
@@ -270,7 +270,7 @@
              '(let ((targets1 nil)
                     (consideration1 nil)
                     (blocking-entry1 nil))
-                (setq targets1 (org-edna--add-targets targets1 
(org-edna--handle-finder 'org-edna-finder/self (quote))))
+                (setq targets1 (org-edna--add-targets targets1 
(org-edna--handle-finder 'org-edna-finder/self 'nil)))
                 (setq blocking-entry1
                       (or blocking-entry1
                           (org-edna--handle-condition 'org-edna-condition/done?
@@ -303,7 +303,7 @@
                        (blocking-entry2 blocking-entry1))
                    (setq targets2
                          (org-edna--add-targets targets2
-                                                (org-edna--handle-finder 
'org-edna-finder/match '"checklist")))
+                                                (org-edna--handle-finder 
'org-edna-finder/match '("checklist"))))
                    (org-edna--handle-action 'org-edna-action/todo!
                                             targets2
                                             (point-marker)
@@ -313,7 +313,7 @@
                        (blocking-entry5 blocking-entry1))
                    (setq targets5
                          (org-edna--add-targets targets5
-                                                (org-edna--handle-finder 
'org-edna-finder/siblings (quote))))
+                                                (org-edna--handle-finder 
'org-edna-finder/siblings 'nil)))
                    (org-edna--handle-action 'org-edna-action/todo!
                                             targets5
                                             (point-marker)
@@ -355,7 +355,7 @@
                         ;; Add targets for checklist match
                         (setq targets3
                               (org-edna--add-targets targets3
-                                                     (org-edna--handle-finder 
'org-edna-finder/match '"checklist")))
+                                                     (org-edna--handle-finder 
'org-edna-finder/match '("checklist"))))
                         ;; Handle condition
                         (setq blocking-entry3
                               (or blocking-entry3
@@ -365,7 +365,7 @@
                        ;; Add targets for self finder
                        (setq targets1
                              (org-edna--add-targets targets1
-                                                    (org-edna--handle-finder 
'org-edna-finder/self (quote))))
+                                                    (org-edna--handle-finder 
'org-edna-finder/self 'nil)))
                        ;; Mark as TODO
                        (org-edna--handle-action 'org-edna-action/todo! targets1
                                                 (point-marker)
@@ -375,7 +375,7 @@
                      ;; Find siblings
                      (setq targets1
                            (org-edna--add-targets targets1
-                                                  (org-edna--handle-finder 
'org-edna-finder/siblings (quote))))
+                                                  (org-edna--handle-finder 
'org-edna-finder/siblings 'nil)))
                      ;; Mark as DONE
                      (org-edna--handle-action 'org-edna-action/todo! targets1
                                               (point-marker)
@@ -416,7 +416,7 @@
                         ;; Add targets for checklist match
                         (setq targets3
                               (org-edna--add-targets targets3
-                                                     (org-edna--handle-finder 
'org-edna-finder/match '"checklist")))
+                                                     (org-edna--handle-finder 
'org-edna-finder/match '("checklist"))))
                         ;; Handle condition
                         (setq blocking-entry3
                               (or blocking-entry3
@@ -426,7 +426,7 @@
                        ;; Add targets for self finder
                        (setq targets1
                              (org-edna--add-targets targets1
-                                                    (org-edna--handle-finder 
'org-edna-finder/self (quote))))
+                                                    (org-edna--handle-finder 
'org-edna-finder/self 'nil)))
                        ;; Mark as TODO
                        (org-edna--handle-action 'org-edna-action/todo! targets1
                                                 (point-marker)
@@ -1083,7 +1083,7 @@
   (let* ((org-edna-finder-use-cache t)
          (org-edna--finder-cache (make-hash-table :test 'equal))
          (org-agenda-files `(,org-edna-test-file))
-         (targets (org-edna--handle-finder 'org-edna-finder/match "test&1")))
+         (targets (org-edna--handle-finder 'org-edna-finder/match 
'("test&1"))))
     (should (= (length targets) 2))
     (should (string-equal (org-edna-heading (nth 0 targets)) "Tagged Heading 
1"))
     (should (string-equal (org-edna-heading (nth 1 targets)) "Tagged Heading 
2"))
@@ -1107,7 +1107,7 @@
          (org-edna--finder-cache (make-hash-table :test 'equal))
          (org-edna-finder-cache-timeout 1) ;; Set timeout to 1 second
          (org-agenda-files `(,org-edna-test-file))
-         (targets (org-edna--handle-finder 'org-edna-finder/match "test&1"))
+         (targets (org-edna--handle-finder 'org-edna-finder/match '("test&1")))
          ;; Time increment required to invalidate a cache entry
          (time-increment `(0 ,org-edna-finder-cache-timeout)))
     (should (org-edna--get-cache-entry 'org-edna-finder/match '("test&1")))
diff --git a/org-edna.el b/org-edna.el
index 37c9849..e271cb0 100644
--- a/org-edna.el
+++ b/org-edna.el
@@ -7,7 +7,7 @@
 ;; Keywords: convenience, text, org
 ;; URL: https://savannah.nongnu.org/projects/org-edna-el/
 ;; Package-Requires: ((emacs "25.1") (seq "2.19") (org "9.0.5"))
-;; Version: 1.0beta7
+;; Version: 1.0beta8
 
 ;; This file is part of GNU Emacs.
 
@@ -387,7 +387,7 @@ correspond to internal variables."
                (`(,type . ,func) (org-edna--function-for-key key)))
     (pcase type
       ('finder
-       `(setq ,target-var (org-edna--add-targets ,target-var 
(org-edna--handle-finder ',func ',@args))))
+       `(setq ,target-var (org-edna--add-targets ,target-var 
(org-edna--handle-finder ',func ',args))))
       ('action
        `(org-edna--handle-action ',func ,target-var (point-marker) ',args))
       ('condition
@@ -547,7 +547,7 @@ following reasons:
      ;; We have an entry created within the allowed interval.
      (t entry))))
 
-(defun org-edna--handle-finder (func-sym &rest args)
+(defun org-edna--handle-finder (func-sym args)
   (if (not org-edna-finder-use-cache)
       ;; Not using cache, so use the function directly.
       (apply func-sym args)
diff --git a/org-edna.info b/org-edna.info
index fde1e6e..4f29ebe 100644
--- a/org-edna.info
+++ b/org-edna.info
@@ -112,6 +112,7 @@ Contributing
 
 Changelog
 
+* 1.0beta8: 10beta8.
 * 1.0beta7: 10beta7.
 * 1.0beta6: 10beta6.
 * 1.0beta5: 10beta5.
@@ -1636,6 +1637,7 @@ Changelog
 
 * Menu:
 
+* 1.0beta8: 10beta8.
 * 1.0beta7: 10beta7.
 * 1.0beta6: 10beta6.
 * 1.0beta5: 10beta5.
@@ -1644,7 +1646,15 @@ Changelog
 * 1.0beta2: 10beta2.
 
 
-File: org-edna.info,  Node: 10beta7,  Next: 10beta6,  Up: Changelog
+File: org-edna.info,  Node: 10beta8,  Next: 10beta7,  Up: Changelog
+
+1.0beta8
+========
+
+Quick fix for beta7.
+
+
+File: org-edna.info,  Node: 10beta7,  Next: 10beta6,  Prev: 10beta8,  Up: 
Changelog
 
 1.0beta7
 ========
@@ -1750,78 +1760,79 @@ Big release here, with three new features.
 
 Tag Table:
 Node: Top225
-Node: Copying4093
-Node: Introduction4915
-Node: Installation and Setup5863
-Node: Basic Operation6587
-Node: Blockers8438
-Node: Triggers8724
-Node: Syntax8986
-Node: Basic Features9676
-Node: Finders9979
-Node: ancestors11744
-Node: children12338
-Node: descendants12748
-Node: file13270
-Node: first-child14019
-Node: ids14279
-Node: match14940
-Node: next-sibling15578
-Node: next-sibling-wrap15835
-Node: olp16149
-Node: org-file16561
-Node: parent17206
-Node: previous-sibling17404
-Node: previous-sibling-wrap17665
-Node: relatives17944
-Node: rest-of-siblings21565
-Node: rest-of-siblings-wrap21850
-Node: self22199
-Node: siblings22360
-Node: siblings-wrap22597
-Node: Actions22901
-Node: Scheduled/Deadline23643
-Node: TODO State27218
-Node: Archive27586
-Node: Chain Property27906
-Node: Clocking28189
-Node: Property28601
-Node: Priority30788
-Node: Tag31357
-Node: Effort31574
-Node: Advanced Features31963
-Node: Finder Cache32411
-Node: Conditions33450
-Node: done34086
-Node: headings34250
-Node: todo-state34626
-Node: variable-set34882
-Node: has-property35311
-Node: re-search35580
-Node: Negating Conditions35940
-Node: Consideration36327
-Node: Conditional Forms37896
-Node: Setting the Properties40552
-Node: Extending Edna41636
-Node: Naming Conventions42126
-Node: Finders 142587
-Node: Actions 142949
-Node: Conditions 143408
-Node: Contributing44294
-Node: Bugs45160
-Node: Working with EDE45517
-Node: Compiling Edna46601
-Node: Testing Edna47470
-Node: Before Sending Changes48451
-Node: Developing with Bazaar49138
-Node: Documentation49879
-Node: Changelog50335
-Node: 10beta750564
-Node: 10beta650842
-Node: 10beta551118
-Node: 10beta451505
-Node: 10beta351758
-Node: 10beta252197
+Node: Copying4114
+Node: Introduction4936
+Node: Installation and Setup5884
+Node: Basic Operation6608
+Node: Blockers8459
+Node: Triggers8745
+Node: Syntax9007
+Node: Basic Features9697
+Node: Finders10000
+Node: ancestors11765
+Node: children12359
+Node: descendants12769
+Node: file13291
+Node: first-child14040
+Node: ids14300
+Node: match14961
+Node: next-sibling15599
+Node: next-sibling-wrap15856
+Node: olp16170
+Node: org-file16582
+Node: parent17227
+Node: previous-sibling17425
+Node: previous-sibling-wrap17686
+Node: relatives17965
+Node: rest-of-siblings21586
+Node: rest-of-siblings-wrap21871
+Node: self22220
+Node: siblings22381
+Node: siblings-wrap22618
+Node: Actions22922
+Node: Scheduled/Deadline23664
+Node: TODO State27239
+Node: Archive27607
+Node: Chain Property27927
+Node: Clocking28210
+Node: Property28622
+Node: Priority30809
+Node: Tag31378
+Node: Effort31595
+Node: Advanced Features31984
+Node: Finder Cache32432
+Node: Conditions33471
+Node: done34107
+Node: headings34271
+Node: todo-state34647
+Node: variable-set34903
+Node: has-property35332
+Node: re-search35601
+Node: Negating Conditions35961
+Node: Consideration36348
+Node: Conditional Forms37917
+Node: Setting the Properties40573
+Node: Extending Edna41657
+Node: Naming Conventions42147
+Node: Finders 142608
+Node: Actions 142970
+Node: Conditions 143429
+Node: Contributing44315
+Node: Bugs45181
+Node: Working with EDE45538
+Node: Compiling Edna46622
+Node: Testing Edna47491
+Node: Before Sending Changes48472
+Node: Developing with Bazaar49159
+Node: Documentation49900
+Node: Changelog50356
+Node: 10beta850606
+Node: 10beta750718
+Node: 10beta651012
+Node: 10beta551288
+Node: 10beta451675
+Node: 10beta351928
+Node: 10beta252367
 
 End Tag Table
 
diff --git a/org-edna.org b/org-edna.org
index 6e6c35f..1f01709 100644
--- a/org-edna.org
+++ b/org-edna.org
@@ -1410,6 +1410,8 @@ making any changes:
 :PROPERTIES:
 :DESCRIPTION: List of changes by version
 :END:
+** 1.0beta8
+Quick fix for beta7.
 ** 1.0beta7
 Biggest change here is the cache.
 
@@ -1418,7 +1420,6 @@ Biggest change here is the cache.
 - Updated documentation to include EDE
 
 - Added testing and compiling documentation
-
 ** 1.0beta6
 Lots of parsing fixes.