diff options
| author | Thomas Fitzsimmons | 2014-11-13 02:21:23 -0500 |
|---|---|---|
| committer | Thomas Fitzsimmons | 2014-11-13 02:32:13 -0500 |
| commit | 78602273d2c377c1c844e2f412e3d1769ae87aff (patch) | |
| tree | a4b0749f472ed26e367b9877c37cf9889450388b | |
| parent | 1e1f5b9cef289f3458455362cef9425e591c7666 (diff) | |
| download | emacs-78602273d2c377c1c844e2f412e3d1769ae87aff.tar.gz emacs-78602273d2c377c1c844e2f412e3d1769ae87aff.zip | |
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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/eudcb-ldap.el | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 192302228e7..d7bef5138f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2014-11-13 Thomas Fitzsimmons <fitzsim@fitzsim.org> | 1 | 2014-11-13 Thomas Fitzsimmons <fitzsim@fitzsim.org> |
| 2 | 2 | ||
| 3 | * net/eudcb-ldap.el: Don't nag the user in case a default base is | ||
| 4 | provided by the LDAP system configuration file. | ||
| 5 | |||
| 6 | 2014-11-13 Thomas Fitzsimmons <fitzsim@fitzsim.org> | ||
| 7 | |||
| 3 | * net/eudc.el (eudc-format-query): Preserve the | 8 | * net/eudc.el (eudc-format-query): Preserve the |
| 4 | eudc-inline-query-format ordering of attributes in the returned | 9 | eudc-inline-query-format ordering of attributes in the returned |
| 5 | list. | 10 | list. |
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 @@ | |||
| 70 | ("mail" . eudc-display-mail) | 70 | ("mail" . eudc-display-mail) |
| 71 | ("url" . eudc-display-url)) | 71 | ("url" . eudc-display-url)) |
| 72 | 'ldap) | 72 | 'ldap) |
| 73 | (eudc-protocol-set 'eudc-switch-to-server-hook | ||
| 74 | '(eudc-ldap-check-base) | ||
| 75 | 'ldap) | ||
| 76 | 73 | ||
| 77 | (defun eudc-ldap-cleanup-record-simple (record) | 74 | (defun eudc-ldap-cleanup-record-simple (record) |
| 78 | "Do some cleanup in a RECORD to make it suitable for EUDC." | 75 | "Do some cleanup in a RECORD to make it suitable for EUDC." |