[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-24 4f5033f: Backport the :end-of-capability fix
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] emacs-24 4f5033f: Backport the :end-of-capability fix |
Date: |
Fri, 06 Feb 2015 03:22:44 +0000 |
branch: emacs-24
commit 4f5033faf26c69c123452d750bb2adfa2e77666b
Author: Wolfgang Jenkner <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>
Backport the :end-of-capability fix
* lisp/net/network-stream.el (network-stream-open-tls): Respect the
:end-of-capability setting (backport)
---
lisp/ChangeLog | 5 +++++
lisp/net/network-stream.el | 6 ++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6c3caa8..17b3d11 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-06 Wolfgang Jenkner <address@hidden>
+
+ * net/network-stream.el (network-stream-open-tls): Respect the
+ :end-of-capability setting.
+
2015-02-05 Juri Linkov <address@hidden>
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 ea03bc6..8bf169d 100644
--- 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-24 4f5033f: Backport the :end-of-capability fix,
Lars Ingebrigtsen <=