[Emacs-diffs] /srv/bzr/emacs/trunk r110340: Bugfix for EUDCB-BBDB queries.

[Chong Yidong]

------------------------------------------------------------
revno: 110340
fixes bug: http://debbugs.gnu.org/11580
author: Sergio Durigan Junior <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Tue 2012-10-02 13:10:16 +0800
message:
  Bugfix for EUDCB-BBDB queries.
  
  * net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix
  querying BBDB for entries without a last name.
modified:
  lisp/ChangeLog
  lisp/net/eudcb-bbdb.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-02 05:02:52 +0000
+++ b/lisp/ChangeLog    2012-10-02 05:10:16 +0000
@@ -1,3 +1,8 @@
+2012-10-02  Sergio Durigan Junior  <address@hidden>
+
+       * net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix
+       querying BBDB for entries without a last name (Bug#11580).
+
 2012-10-02  Chong Yidong  <address@hidden>
 
        * emacs-lisp/eieio.el: Restore Version header.

=== modified file 'lisp/net/eudcb-bbdb.el'
--- a/lisp/net/eudcb-bbdb.el    2012-01-19 07:21:25 +0000
+++ b/lisp/net/eudcb-bbdb.el    2012-10-02 05:10:16 +0000
@@ -166,18 +166,18 @@
                                  (symbol-name attr)))
                         'record))))
        (t
-       (setq val "Unknown BBDB attribute")))
-      (if val
-       (cond
-        ((memq attr '(phones addresses))
-         (setq eudc-rec (append val eudc-rec)))
-        ((and (listp val)
-         (= 1 (length val)))
-         (setq eudc-rec (cons (cons attr (car val)) eudc-rec)))
-        ((> (length val) 0)
-         (setq eudc-rec (cons (cons attr val) eudc-rec)))
-        (t
-         (error "Unexpected attribute value")))))
+       (error "Unknown BBDB attribute")))
+      (cond
+       ((or (not val) (equal val ""))) ; do nothing
+       ((memq attr '(phones addresses))
+       (setq eudc-rec (append val eudc-rec)))
+       ((and (listp val)
+            (= 1 (length val)))
+       (setq eudc-rec (cons (cons attr (car val)) eudc-rec)))
+       ((> (length val) 0)
+       (setq eudc-rec (cons (cons attr val) eudc-rec)))
+       (t
+       (error "Unexpected attribute value"))))
     (nreverse eudc-rec)))