diff --git a/ChangeLog b/ChangeLog
index 35ddb4b..616832d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
2011-12-27 Sam Steingold <s...@gnu.org>
+ * lisp/bbdb-mua.el (bbdb-update-records):
+ Use `symbol-value' instead of `eval' for symbols.
+ * lisp/bbdb.el (bbdb-label-completion-list)
+ (bbdb-label-completion-default, bbdb-data-completion-list)
+ (bbdb-data-completion-default): Ditto.
+
+2011-12-27 Sam Steingold <s...@gnu.org>
* lisp/bbdb-mua.el (bbdb-annotate-message): Do not offer to
replace the name if it is already an AKA.
diff --git a/lisp/bbdb-mua.el b/lisp/bbdb-mua.el
index 1a34282..e0059a1 100644
--- a/lisp/bbdb-mua.el
+++ b/lisp/bbdb-mua.el
@@ -218,8 +218,9 @@ Usually this function is called by the wrapper
`bbdb-mua-update-records'."
(not (eq update-p 'search)))
(setq update-p (funcall update-p)))
(unless update-p
- (setq update-p (eval (intern-soft (format "bbdb/%s-update-records-p"
- (bbdb-mua)))))
+ (setq update-p (symbol-value
+ (intern-soft (format "bbdb/%s-update-records-p"
+ (bbdb-mua)))))
(if (and (functionp update-p)
(not (eq update-p 'search)))
(setq update-p (funcall update-p))))
diff --git a/lisp/bbdb.el b/lisp/bbdb.el
index a25cd34..4199d61 100644
--- a/lisp/bbdb.el
+++ b/lisp/bbdb.el
@@ -2353,7 +2353,7 @@ This evaluates the variable bbdb-FIELD-label-list, such
as `bbdb-phone-label-list'."
(let ((sym (intern-soft (format "bbdb-%s-label-list" field))))
(if (boundp sym)
- (eval sym)
+ (symbol-value sym)
bbdb-default-label-list)))
(defun bbdb-label-completion-default (field)
@@ -2364,7 +2364,7 @@ the first item from the list of completions for FIELD as
returned by `bbdb-label-completion-list'."
(let ((sym (intern-soft (format "bbdb-default-%s-label" field))))
(if (boundp sym)
- (eval sym)
+ (symbol-value sym)
(car (bbdb-label-completion-list field)))))
;; These are so you can accumulate e.g. mail aliases or organization names
@@ -2376,7 +2376,7 @@ as `bbdb-mail-alias-data-list', if it exists, or it uses
`bbdb-default-label-list'."
(let ((sym (intern-soft (format "bbdb-%s-data-list" field))))
(if (boundp sym)
- (eval sym)
+ (symbol-value sym)
bbdb-default-label-list)))
(defun bbdb-data-completion-default (field)
@@ -2387,7 +2387,7 @@ the first item from the list of completions for FIELD as
returned by `bbdb-data-completion-list'."
(let ((sym (intern-soft (format "bbdb-default-%s-data" field))))
(if (boundp sym)
- (eval sym)
+ (symbol-value sym)
(nth 0 (bbdb-label-completion-list field)))))
;;;
--
Sam Steingold (http://sds.podval.org/) on Ubuntu 11.10 (oneiric) X 11.0.11004000
http://www.PetitionOnline.com/tap12009/ http://memri.org
http://mideasttruth.com http://camera.org http://iris.org.il http://pmw.org.il
He who laughs last did not get the joke.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
bbdb-info@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bbdb-info
BBDB Home Page: http://bbdb.sourceforge.net/
