emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/dict-tree 9e6d0f2 017/154: Fixed bug when deleting non-


From: Stefan Monnier
Subject: [elpa] externals/dict-tree 9e6d0f2 017/154: Fixed bug when deleting non-existent entries.
Date: Mon, 14 Dec 2020 12:21:35 -0500 (EST)

branch: externals/dict-tree
commit 9e6d0f230df987a6bc446b77f2388c0d8201a6bf
Author: Toby Cubitt <toby-predictive@dr-qubit.org>
Commit: tsc25 <toby-predictive@dr-qubit.org>

    Fixed bug when deleting non-existent entries.
---
 dict-tree.el | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dict-tree.el b/dict-tree.el
index e744da1..7e8728a 100644
--- a/dict-tree.el
+++ b/dict-tree.el
@@ -1039,7 +1039,8 @@ Returns non-nil if KEY was deleted, nil if KEY was not in 
DICT."
              (dictree--meta-dict-list dict)))))
 
     ;; return deleted key/data pair
-    (cons (car deleted) (dictree--unwrap-data (cdr deleted)))))
+    (when deleted
+      (cons (car deleted) (dictree--unwrap-data (cdr deleted))))))
 
 
 
@@ -1372,11 +1373,13 @@ descending order if REVERSE is non-nil."
            dictree-mapf--accumulate)
        (while (setq dictree-mapf--entry
                     (dictree-stack-pop dictree-mapf--stack))
-         (funcall dictree-mapf--combinator
-                  (funcall dictree-mapf--function
-                           (car dictree-mapf--entry)
-                           (cdr dictree-mapf--entry)))))
-      )))
+         (setq dictree-mapf--accumulate
+               (funcall dictree-mapf--combinator
+                        (funcall dictree-mapf--function
+                                 (car dictree-mapf--entry)
+                                 (cdr dictree-mapf--entry))
+                        dictree-mapf--accumulate)))
+       dictree-mapf--accumulate))))
 
 
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]