mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Backport the :end-of-capability fix

Browse source 
* lisp/net/network-stream.el (network-stream-open-tls): Respect the
:end-of-capability setting (backport)
This commit is contained in:
Wolfgang Jenkner 2015-02-06 13:43:58 +11:00 • committed by Lars Magne Ingebrigtsen
parent c0ba5908b1
commit 4f5033faf2
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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,

6
lisp/net/network-stream.el
View file

@ -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)