Backport the :end-of-capability fix

* lisp/net/network-stream.el (network-stream-open-tls): Respect the
:end-of-capability setting (backport)

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c3caa826e8..17b3d112432 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-06  Wolfgang Jenkner  <wjenkner@inode.at>
+
+        * net/network-stream.el (network-stream-open-tls): Respect the
+        :end-of-capability setting.
+
 2015-02-05  Juri Linkov  <juri@linkov.net>
 
         Revert the previous change of comint-line-beginning-position callers,
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index ea03bc65499..8bf169dea70 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -363,10 +363,12 @@ a greeting from the server.
           (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)