diff options
| author | Wolfgang Jenkner <wjenkner@inode.at> | 2015-02-06 13:43:58 +1100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2015-02-06 13:43:58 +1100 |
| commit | bc4996520a3919bfc52e6fd95f6a0cb7c4c085aa (patch) | |
| tree | 8b4f1dc6078361900d2fbd2c37d656737e15a504 /lisp | |
| parent | f4d7de6f9cee7e10ecf8c56d6bb14e23372e08dc (diff) | |
| download | emacs-bc4996520a3919bfc52e6fd95f6a0cb7c4c085aa.tar.gz | |
Respect the :end-of-capability setting
* lisp/net/network-stream.el (network-stream-open-tls): Respect the
:end-of-capability setting.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/network-stream.el | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index dc85bea0049..60746cef3f3 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 Artur Malabarba <bruce.connor.am@gmail.com> * emacs-lisp/package.el (package--sort-by-dependence): New diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index e7b3150b792..0104fa7dd12 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) |