Commit 4f5033fa authored by Wolfgang Jenkner's avatar Wolfgang Jenkner Committed by Lars Magne Ingebrigtsen
Browse files

Backport the :end-of-capability fix

* lisp/net/network-stream.el (network-stream-open-tls): Respect the
:end-of-capability setting (backport)
parent c0ba5908
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,
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment