[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 36a7480 2/3: Merge branch 'master' of git.sv.gnu.or
|
From: |
Michael Albinus |
|
Subject: |
[Emacs-diffs] master 36a7480 2/3: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs |
|
Date: |
Thu, 24 Jan 2019 11:40:20 -0500 (EST) |
branch: master
commit 36a748091d037ec2b3f3d4de1ac4ab09d90fc168
Merge: 24f1100 89ec69b
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
---
lisp/net/network-stream.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el
index 4b00650..2b3292b 100644
--- a/lisp/net/network-stream.el
+++ b/lisp/net/network-stream.el
@@ -48,6 +48,7 @@
(declare-function starttls-available-p "starttls" ())
(declare-function starttls-negotiate "starttls" (process))
+(declare-function starttls-open-stream "starttls" (name buffer host port))
(autoload 'gnutls-negotiate "gnutls")
(autoload 'open-gnutls-stream "gnutls")