diff options
| author | Michael Albinus | 2019-01-24 17:39:40 +0100 |
|---|---|---|
| committer | Michael Albinus | 2019-01-24 17:39:40 +0100 |
| commit | 36a748091d037ec2b3f3d4de1ac4ab09d90fc168 (patch) | |
| tree | 124f26f5a23f8aec2823cc8556cc5ce3a100d150 | |
| parent | 24f11003d27cf81ae6c844b8aed825e1ab561654 (diff) | |
| parent | 89ec69becb0f5102a26c3b66867382180b83d389 (diff) | |
| download | emacs-36a748091d037ec2b3f3d4de1ac4ab09d90fc168.tar.gz emacs-36a748091d037ec2b3f3d4de1ac4ab09d90fc168.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
| -rw-r--r-- | lisp/net/network-stream.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index 4b006503d88..2b3292b71ba 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | 48 | ||
| 49 | (declare-function starttls-available-p "starttls" ()) | 49 | (declare-function starttls-available-p "starttls" ()) |
| 50 | (declare-function starttls-negotiate "starttls" (process)) | 50 | (declare-function starttls-negotiate "starttls" (process)) |
| 51 | (declare-function starttls-open-stream "starttls" (name buffer host port)) | ||
| 51 | 52 | ||
| 52 | (autoload 'gnutls-negotiate "gnutls") | 53 | (autoload 'gnutls-negotiate "gnutls") |
| 53 | (autoload 'open-gnutls-stream "gnutls") | 54 | (autoload 'open-gnutls-stream "gnutls") |