From: Thomas Fitzsimmons <fitzsim@fitzsim.org>
Date: Thu, 13 Nov 2014 07:21:23 +0000 (-0500)
Subject: Do not ask the user for an LDAP base if a default has been provided
X-Git-Tag: emacs-25.0.90~2582^2~2^2~5
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=78602273d2c377c1c844e2f412e3d1769ae87aff;p=emacs.git

Do not ask the user for an LDAP base if a default has been provided

* net/eudcb-ldap.el: Don't nag the user in case a default base is
provided by the LDAP system configuration file.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 192302228e7..d7bef5138f8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-11-13  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
+
+	* net/eudcb-ldap.el: Don't nag the user in case a default base is
+	provided by the LDAP system configuration file.
+
 2014-11-13  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 
 	* net/eudc.el (eudc-format-query): Preserve the
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index e43e5701eb1..6d0c208f1a2 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -70,9 +70,6 @@
 		     ("mail" . eudc-display-mail)
 		     ("url" . eudc-display-url))
 		   'ldap)
-(eudc-protocol-set 'eudc-switch-to-server-hook
-		   '(eudc-ldap-check-base)
-		   'ldap)
 
 (defun eudc-ldap-cleanup-record-simple (record)
   "Do some cleanup in a RECORD to make it suitable for EUDC."