branch: externals/ebdb
commit 9e2c0e837538a74862a4f1fe4c95020690ba384f
Author: Eric Abrahamsen <[email protected]>
Commit: Eric Abrahamsen <[email protected]>
Fix logic of loading records from multiple databases
* ebdb.el (ebdb-db-load): This should now work correctly.
---
ebdb.el | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ebdb.el b/ebdb.el
index c8f6f20..44d913e 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -2850,11 +2850,11 @@ overwrite data somewhere."
(dolist (d (slot-value (ebdb-record-cache deleter) 'database))
;; Use low-level functions for this so we don't set the
;; database dirty.
- (object-remove-from-list db 'records deleter)
- (object-add-to-list db 'records keeper)
+ (object-remove-from-list d 'records deleter)
+ (object-add-to-list d 'records keeper)
(object-add-to-list (ebdb-record-cache keeper)
- 'database d))
- (ebdb-delete-record deleter))))))
+ 'database d)
+ (ebdb-delete-record deleter d t)))))))
(cl-defmethod ebdb-db-unload ((db ebdb-db))
"Unload database DB.
