[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/net/eudcb-bbdb.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/net/eudcb-bbdb.el,v |
Date: |
Tue, 04 Dec 2007 03:54:10 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/12/04 03:54:10
Index: eudcb-bbdb.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/net/eudcb-bbdb.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- eudcb-bbdb.el 30 Nov 2007 07:49:41 -0000 1.15
+++ eudcb-bbdb.el 4 Dec 2007 03:54:10 -0000 1.16
@@ -107,8 +107,7 @@
(declare-function bbdb-phone-location "ext:bbdb" t) ; via bbdb-defstruct
(declare-function bbdb-phone-string "ext:bbdb" (phone))
(declare-function bbdb-record-phones "ext:bbdb" t) ; via bbdb-defstruct
-;; FIXME: bbdb-address-street1/2/3 don't seem to exist in current
-;; bbdb, so this code is probably broken.
+(declare-function bbdb-address-streets "ext:bbdb" t) ; via bbdb-defstruct
(declare-function bbdb-address-city "ext:bbdb" t) ; via bbdb-defstruct
(declare-function bbdb-address-state "ext:bbdb" t) ; via bbdb-defstruct
(declare-function bbdb-address-zip "ext:bbdb" t) ; via bbdb-defstruct
@@ -130,24 +129,23 @@
(defun eudc-bbdb-extract-addresses (record)
(let (s c val)
- (mapcar (function
- (lambda (address)
- (setq val (concat (unless (= 0 (length (setq s
(bbdb-address-street1 address))))
- (concat s "\n"))
- (unless (= 0 (length (setq s
(bbdb-address-street2 address))))
- (concat s "\n"))
- (unless (= 0 (length (setq s
(bbdb-address-street3 address))))
- (concat s "\n"))
- (progn
- (setq c (bbdb-address-city address))
- (setq s (bbdb-address-state address))
+ (mapcar (lambda (address)
+ (setq c (bbdb-address-streets address))
+ (dotimes (n 3)
+ (unless (zerop (length (setq s (nth n c))))
+ (setq val (concat val s "\n"))))
+ (setq c (bbdb-address-city address)
+ s (bbdb-address-state address))
+ (setq val (concat val
(if (and (> (length c) 0) (> (length s) 0))
- (concat c ", " s " ")
- (concat c " ")))
+ (concat c ", " s)
+ c)
+ " "
(bbdb-address-zip address)))
(if eudc-bbdb-use-locations-as-attribute-names
(cons (intern (bbdb-address-location address)) val)
- (cons 'addresses (concat (bbdb-address-location address) "\n"
val)))))
+ (cons 'addresses (concat (bbdb-address-location address)
+ "\n" val))))
(bbdb-record-addresses record))))
(defun eudc-bbdb-format-record-as-result (record)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/net/eudcb-bbdb.el,v,
Glenn Morris <=