[elpa] externals/ebdb a948910 2/4: Fix up addition of fields to records during snarfing

[Eric Abrahamsen]

branch: externals/ebdb
commit a94891010681d5437fadf8d58ecec5b68ea32aaa
Author: Eric Abrahamsen <eric@ericabrahamsen.net>
Commit: Eric Abrahamsen <eric@ericabrahamsen.net>

    Fix up addition of fields to records during snarfing
    
    * ebdb-snarf.el (ebdb-snarf-collapse): Remove unnecessary `progn'.
    (ebdb-snarf-query): Add missing `progn': this was preventing fields
    from being initialized.
---
 ebdb-snarf.el | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ebdb-snarf.el b/ebdb-snarf.el
index b25747d..d2ff254 100644
--- a/ebdb-snarf.el
+++ b/ebdb-snarf.el
@@ -270,15 +270,14 @@ vectors, usually to `ebdb-snarf-query'."
              ;; the fields and names, and doesn't already have them.
              (dolist (f fields)
                (condition-case nil
-                   (progn
-                     (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)))
+                   (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
@@ -350,9 +349,10 @@ automatically."
                                            (ebdb-string elt)
                                            (ebdb-string record)))
                       (condition-case nil
-                          (ebdb-record-insert-field
-                           record elt)
-                        (ebdb-init-field elt record)
+                          (progn
+                            (ebdb-record-insert-field
+                             record elt)
+                            (ebdb-init-field elt record))
                         (ebdb-unacceptable-field nil))
                     (push elt leftovers)))
                 (dolist (n names)