[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master bc49965 1/2: Respect the :end-of-capability setting
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master bc49965 1/2: Respect the :end-of-capability setting |
Date: |
Fri, 06 Feb 2015 03:04:29 +0000 |
branch: master
commit bc4996520a3919bfc52e6fd95f6a0cb7c4c085aa
Author: Wolfgang Jenkner <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>
Respect the :end-of-capability setting
* lisp/net/network-stream.el (network-stream-open-tls): Respect the
:end-of-capability setting.
---
lisp/ChangeLog | 5 +++++
lisp/net/network-stream.el | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dc85bea..60746ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-06 Wolfgang Jenkner <address@hidden>
+
+ * net/network-stream.el (network-stream-open-tls): Respect the
+ :end-of-capability setting.
+
2015-02-05 Artur Malabarba <address@hidden>
* emacs-lisp/package.el (package--sort-by-dependence): New
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index e7b3150..0104fa7 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -374,10 +374,12 @@ asynchronously, if possible."
(when (re-search-forward eoc nil t)
(goto-char (match-beginning 0))
(delete-region (point-min) (line-beginning-position))))
- (let* ((capability-command (plist-get parameters :capability-command)))
+ (let ((capability-command (plist-get parameters :capability-command))
+ (eo-capa (or (plist-get parameters :end-of-capability)
+ eoc)))
(list stream
(network-stream-get-response stream start eoc)
- (network-stream-command stream capability-command eoc)
+ (network-stream-command stream capability-command eo-capa)
'tls))))))
(defun network-stream-open-shell (name buffer host service parameters)