aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/net/eudcb-bbdb.el5
1 files changed, 0 insertions, 5 deletions
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index 6541a2e788b..cd7afcf2861 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -88,7 +88,6 @@ for continued use of those old names."
88 88
89(defun eudc-bbdb-filter-non-matching-record (record) 89(defun eudc-bbdb-filter-non-matching-record (record)
90 "Return RECORD if it is a match for `eudc-bbdb-current-query', nil otherwise." 90 "Return RECORD if it is a match for `eudc-bbdb-current-query', nil otherwise."
91 (require 'bbdb)
92 (catch 'unmatch 91 (catch 'unmatch
93 (progn 92 (progn
94 (dolist (condition eudc-bbdb-current-query) 93 (dolist (condition eudc-bbdb-current-query)
@@ -118,7 +117,6 @@ for continued use of those old names."
118 117
119(defun eudc-bbdb-extract-phones (record) 118(defun eudc-bbdb-extract-phones (record)
120 "Extract phone numbers from BBDB RECORD." 119 "Extract phone numbers from BBDB RECORD."
121 (require 'bbdb)
122 ;; Keep same order as in BBDB record. 120 ;; Keep same order as in BBDB record.
123 (nreverse 121 (nreverse
124 (mapcar (function 122 (mapcar (function
@@ -133,7 +131,6 @@ for continued use of those old names."
133 131
134(defun eudc-bbdb-extract-addresses (record) 132(defun eudc-bbdb-extract-addresses (record)
135 "Extract addresses from BBDB RECORD." 133 "Extract addresses from BBDB RECORD."
136 (require 'bbdb)
137 (let (s c val) 134 (let (s c val)
138 (nreverse 135 (nreverse
139 (mapcar (lambda (address) 136 (mapcar (lambda (address)
@@ -159,7 +156,6 @@ for continued use of those old names."
159(defun eudc-bbdb-format-record-as-result (record) 156(defun eudc-bbdb-format-record-as-result (record)
160 "Format the BBDB RECORD as a EUDC query result record. 157 "Format the BBDB RECORD as a EUDC query result record.
161The record is filtered according to `eudc-bbdb-current-return-attributes'" 158The record is filtered according to `eudc-bbdb-current-return-attributes'"
162 (require 'bbdb)
163 (let ((attrs (or eudc-bbdb-current-return-attributes 159 (let ((attrs (or eudc-bbdb-current-return-attributes
164 '(firstname lastname aka organization phone address mail 160 '(firstname lastname aka organization phone address mail
165 notes))) 161 notes)))
@@ -208,7 +204,6 @@ QUERY is a list of cons cells (ATTR . VALUE) where ATTRs should be valid
208BBDB attribute names. 204BBDB attribute names.
209RETURN-ATTRS is a list of attributes to return, defaulting to 205RETURN-ATTRS is a list of attributes to return, defaulting to
210`eudc-default-return-attributes'." 206`eudc-default-return-attributes'."
211 (require 'bbdb)
212 (let ((eudc-bbdb-current-query query) 207 (let ((eudc-bbdb-current-query query)
213 (eudc-bbdb-current-return-attributes return-attrs) 208 (eudc-bbdb-current-return-attributes return-attrs)
214 (query-attrs (eudc-bbdb-format-query query)) 209 (query-attrs (eudc-bbdb-format-query query))