# HG changeset patch
# User Andreas Schwab <schwab@linux-m68k.org>
# Date 1294601659 -3600
# Node ID daedfad2f1e3b3f6707115d7bc0495d0940d615e
# Parent  7bdc1e5a82a97c298f5a14f0109b2ac1d7e9078b
* lisp/net/ldap.el (ldap-search-internal): Don't use eval.

diff -r 7bdc1e5a82a9 -r daedfad2f1e3 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 09 18:49:25 2011 +0100
+++ b/lisp/ChangeLog	Sun Jan 09 20:34:19 2011 +0100
@@ -1,3 +1,7 @@
+2011-01-09  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* net/ldap.el (ldap-search-internal): Don't use eval.
+
 2011-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
 	* subr.el (read-char-choice): Use read-key.
diff -r 7bdc1e5a82a9 -r daedfad2f1e3 lisp/net/ldap.el
--- a/lisp/net/ldap.el	Sun Jan 09 18:49:25 2011 +0100
+++ b/lisp/net/ldap.el	Sun Jan 09 20:34:19 2011 +0100
@@ -1,7 +1,7 @@
 ;;; ldap.el --- client interface to LDAP for Emacs
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: FSF
@@ -556,13 +556,9 @@
       (if (and sizelimit
 	       (not (equal "" sizelimit)))
 	  (setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
-      (eval `(call-process ldap-ldapsearch-prog
-			   nil
-			   buf
-			   nil
-			   ,@arglist
-			   ,@ldap-ldapsearch-args
-			   ,@filter))
+      (apply #'call-process ldap-ldapsearch-prog
+	     nil buf nil
+	     (append arglist ldap-ldapsearch-args filter))
       (insert "\n")
       (goto-char (point-min))