diff options
| author | Joakim Verona | 2015-02-08 21:55:28 +0100 |
|---|---|---|
| committer | Joakim Verona | 2015-02-08 21:55:28 +0100 |
| commit | 5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529 (patch) | |
| tree | 860e0d53399626aee6249ebb5f972879f403b228 /lisp/net/network-stream.el | |
| parent | 148262ce3db990ed16989341345e232570b3a338 (diff) | |
| parent | 7d631aa0ffab875e4979727f632703ad5b4100a2 (diff) | |
| download | emacs-5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529.tar.gz emacs-5e1d5ef39ca0d2fbff26d659f2ec6ce863b14529.zip | |
merge masterxwidget
Diffstat (limited to 'lisp/net/network-stream.el')
| -rw-r--r-- | lisp/net/network-stream.el | 6 |
1 files changed, 4 insertions, 2 deletions
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." | |||
| 374 | (when (re-search-forward eoc nil t) | 374 | (when (re-search-forward eoc nil t) |
| 375 | (goto-char (match-beginning 0)) | 375 | (goto-char (match-beginning 0)) |
| 376 | (delete-region (point-min) (line-beginning-position)))) | 376 | (delete-region (point-min) (line-beginning-position)))) |
| 377 | (let* ((capability-command (plist-get parameters :capability-command))) | 377 | (let ((capability-command (plist-get parameters :capability-command)) |
| 378 | (eo-capa (or (plist-get parameters :end-of-capability) | ||
| 379 | eoc))) | ||
| 378 | (list stream | 380 | (list stream |
| 379 | (network-stream-get-response stream start eoc) | 381 | (network-stream-get-response stream start eoc) |
| 380 | (network-stream-command stream capability-command eoc) | 382 | (network-stream-command stream capability-command eo-capa) |
| 381 | 'tls)))))) | 383 | 'tls)))))) |
| 382 | 384 | ||
| 383 | (defun network-stream-open-shell (name buffer host service parameters) | 385 | (defun network-stream-open-shell (name buffer host service parameters) |