Mercurial > emacs
changeset 86816:4a5a63e12e5a
(bbdb-phone-location, bbdb-phone-string)
(bbdb-record-phones, bbdb-address-city, bbdb-address-state)
(bbdb-address-zip, bbdb-address-location, bbdb-record-addresses)
(bbdb-records): Declare as functions.
(eudc-bbdb-extract-addresses): Use bbdb-address-zip rather than
bbdb-address-zip-string.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Thu, 29 Nov 2007 04:28:28 +0000 |
| parents | 23a61077ba03 |
| children | be7be23ea4b9 |
| files | lisp/net/eudcb-bbdb.el |
| diffstat | 1 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/net/eudcb-bbdb.el Thu Nov 29 04:27:27 2007 +0000 +++ b/lisp/net/eudcb-bbdb.el Thu Nov 29 04:28:28 2007 +0000 @@ -103,6 +103,20 @@ eudc-bbdb-current-query) record))) +;; External. +(declare-function bbdb-phone-location "ext:bbdb") ; via bbdb-defstruct +(declare-function bbdb-phone-string "ext:bbdb" (phone)) +(declare-function bbdb-record-phones "ext:bbdb") ; 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-city "ext:bbdb") ; via bbdb-defstruct +(declare-function bbdb-address-state "ext:bbdb") ; via bbdb-defstruct +(declare-function bbdb-address-zip "ext:bbdb") ; via bbdb-defstruct +(declare-function bbdb-address-location "ext:bbdb") ; via bbdb-defstruct +(declare-function bbdb-record-addresses "ext:bbdb") ; via bbdb-defstruct +(declare-function bbdb-records "ext:bbdb" + (&optional dont-check-disk already-in-db-buffer)) + (defun eudc-bbdb-extract-phones (record) (mapcar (function (lambda (phone) @@ -130,7 +144,7 @@ (if (and (> (length c) 0) (> (length s) 0)) (concat c ", " s " ") (concat c " "))) - (bbdb-address-zip-string address))) + (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)))))