[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-26 809989f: LDAP: Set process-connection-type to t o
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs-26 809989f: LDAP: Set process-connection-type to t on Darwin |
Date: |
Thu, 29 Nov 2018 05:40:38 -0500 (EST) |
branch: emacs-26
commit 809989f79ee4038f50d18765c4b727c8451ae0da
Author: Thomas Fitzsimmons <address@hidden>
Commit: Eli Zaretskii <address@hidden>
LDAP: Set process-connection-type to t on Darwin
* lisp/net/ldap.el (ldap-search-internal): Set
process-connection-type to t on Darwin. Do not merge to
master. (Bug#33050)
---
lisp/net/ldap.el | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 7b47a54..b106de0 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -646,7 +646,12 @@ an alist of attribute/value pairs."
(not (equal "" sizelimit)))
(setq arglist (nconc arglist (list (format "-z%s" sizelimit)))))
(if passwd
- (let* ((process-connection-type nil)
+ ;; Work around Bug#33154, see also Bug#33050. Leaving
+ ;; process-connection-type at its default (typically t)
+ ;; would probably be fine too, however this is the minimal
+ ;; change on the release branch that fixes ldap.el on Darwin
+ ;; and leaves other operating systems unchanged.
+ (let* ((process-connection-type (eq system-type 'darwin))
(proc-args (append arglist ldap-ldapsearch-args
filter))
(proc (apply #'start-process "ldapsearch" buf
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-26 809989f: LDAP: Set process-connection-type to t on Darwin,
Eli Zaretskii <=