branch: externals/ebdb
commit 2c42f1b4d10a1dba28bdffdbb6daa8f4eab9c07e
Author: Eric Abrahamsen <e...@ericabrahamsen.net>
Commit: Eric Abrahamsen <e...@ericabrahamsen.net>
Fix to snarfing collapse
* ebdb-snarf.el (ebdb-snarf-collapse): The two clauses handling fields
and names were meant to both be protected under the (when record...
clause.
---
ebdb-snarf.el | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/ebdb-snarf.el b/ebdb-snarf.el
index 8936fd0..1d0ec23 100644
--- a/ebdb-snarf.el
+++ b/ebdb-snarf.el
@@ -261,27 +261,27 @@ vectors, usually to `ebdb-snarf-query'."
(ebdb-string f)))
(append fields names)))))
(setq record rec)))
- (if record
- (dolist (f fields)
- (condition-case nil
- (progn
- ;; Make sure that record can accept field, and doesn't
- ;; already have it.
- (when (and (car-safe (ebdb-record-field-slot-query
- (eieio-object-class record)
- `(nil . ,(eieio-object-class f))))
- (null (ebdb-record-search
- record
- (eieio-object-class f)
- (ebdb-string f))))
- (push f out-fields)))
- (ebdb-unacceptable-field nil)))
+ (when record
+ (dolist (f fields)
+ (condition-case nil
+ (progn
+ ;; Make sure that record can accept field, and doesn't
+ ;; already have it.
+ (when (and (car-safe (ebdb-record-field-slot-query
+ (eieio-object-class record)
+ `(nil . ,(eieio-object-class f))))
+ (null (ebdb-record-search
+ record
+ (eieio-object-class f)
+ (ebdb-string f))))
+ (push f out-fields)))
+ (ebdb-unacceptable-field nil)))
(dolist (name names)
(unless (ebdb-record-search
record 'ebdb-field-name (ebdb-string name))
- (push name out-names)))
- (setq out-names names
- out-fields fields))
+ (push name out-names))))
+ (setq out-names names
+ out-fields fields)
(push (vector record out-names out-fields) output)))
output))
