Backport the :end-of-capability fix

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c3caa826e88beae13ccd2a3f35c5d116b2fdec3..17b3d112432a653152e2f2b1fe1e7828e7985f56 100644 (file)
--- 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 ea03bc6549956bdb55af9ef1405c7f468b260628..8bf169dea700af84dbb68867b4abdfb9f5425f11 100644 (file)
--- 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)