diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-08-19 16:48:59 -0700 |
| commit | 07fcbb558d797272b9f43547da60beda485873a3 (patch) | |
| tree | 77d5da14e9f9d9d8b1d877c70c01296fd3893796 /lisp/net/network-stream.el | |
| parent | c9bdeff3e45a7ac84a74a81bb048046f82dddc91 (diff) | |
| parent | fb81c8c3adf8633f2f617c82f6019aef630860c7 (diff) | |
| download | emacs-07fcbb558d797272b9f43547da60beda485873a3.tar.gz | |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/net/network-stream.el')
| -rw-r--r-- | lisp/net/network-stream.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/net/network-stream.el b/lisp/net/network-stream.el index b45cefcb442..1983688cef2 100644 --- a/lisp/net/network-stream.el +++ b/lisp/net/network-stream.el @@ -248,8 +248,7 @@ gnutls-boot (as returned by `gnutls-boot-parameters')." (list key cert))))))) ;;;###autoload -(defalias 'open-protocol-stream 'open-network-stream) -(define-obsolete-function-alias 'open-protocol-stream 'open-network-stream +(define-obsolete-function-alias 'open-protocol-stream #'open-network-stream "26.1") (defun network-stream-open-plain (name buffer host service parameters) |