diff options
| author | Lars Ingebrigtsen | 2016-02-03 12:43:24 +1100 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2016-02-03 12:43:24 +1100 |
| commit | 894e21df1e1a38244ad0c8179adf4b632b25a592 (patch) | |
| tree | f866b91e463d951061fc331249700740e179603b /doc | |
| parent | eb597d40950d0b8f126641bf458af28fcab150d5 (diff) | |
| download | emacs-894e21df1e1a38244ad0c8179adf4b632b25a592.tar.gz emacs-894e21df1e1a38244ad0c8179adf4b632b25a592.zip | |
Doc fixes and refactorings based on comments from Eli Zaretskii
* doc/lispref/processes.texi (Network Processes): Clarify the
meaning of :tls-parameters.
* lisp/net/gnutls.el (open-gnutls-stream): Clarify :nowait.
* lisp/net/gnutls.el (gnutls-boot-parameters): Factor out into
own function.
(gnutls-negotiate): Use it.
(open-gnutls-stream): Ditto.
* src/eval.c (vformat_string): Refactor out the printing bits
from verror.
(verror): Use it.
* src/gnutls.c (boot_error): Mark failed processes with the
real error message.
* src/lisp.h: Declare vformat_string.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/lispref/processes.texi | 9 | ||||
| -rw-r--r-- | doc/misc/emacs-gnutls.texi | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index e77da779cc5..ccff1381af2 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -2420,9 +2420,12 @@ has succeeded or failed. | |||
| 2420 | 2420 | ||
| 2421 | @item :tls-parameters | 2421 | @item :tls-parameters |
| 2422 | When opening a TLS connection, this should be where the first element | 2422 | When opening a TLS connection, this should be where the first element |
| 2423 | is the TLS type, and the remaining elements should form a keyword list | 2423 | is the TLS type (which should either be @code{gnutls-x509pki} or |
| 2424 | acceptable for @code{gnutls-boot}. The TLS connection will then be | 2424 | @code{gnutls-anon}, and the remaining elements should form a keyword |
| 2425 | negotiated after completing the connection to the host. | 2425 | list acceptable for @code{gnutls-boot}. (This keyword list can be |
| 2426 | optained from the @code{gnutls-boot-parameters} function.) The TLS | ||
| 2427 | connection will then be negotiated after completing the connection to | ||
| 2428 | the host. | ||
| 2426 | 2429 | ||
| 2427 | @item :stop @var{stopped} | 2430 | @item :stop @var{stopped} |
| 2428 | If @var{stopped} is non-@code{nil}, start the network connection or | 2431 | If @var{stopped} is non-@code{nil}, start the network connection or |
diff --git a/doc/misc/emacs-gnutls.texi b/doc/misc/emacs-gnutls.texi index 75fd97c7c74..115727fb8ee 100644 --- a/doc/misc/emacs-gnutls.texi +++ b/doc/misc/emacs-gnutls.texi | |||
| @@ -181,6 +181,10 @@ syntax are the same as those given to @code{open-network-stream} | |||
| 181 | Manual}). The connection process is called @var{name} (made unique if | 181 | Manual}). The connection process is called @var{name} (made unique if |
| 182 | necessary). This function returns the connection process. | 182 | necessary). This function returns the connection process. |
| 183 | 183 | ||
| 184 | The @var{nowait} parameter means that the scoket should be | ||
| 185 | asynchronous, and the connection process will be returned to the | ||
| 186 | caller before TLS negotiation has happened. | ||
| 187 | |||
| 184 | @lisp | 188 | @lisp |
| 185 | ;; open a HTTPS connection | 189 | ;; open a HTTPS connection |
| 186 | (open-gnutls-stream "tls" "tls-buffer" "yourserver.com" "https") | 190 | (open-gnutls-stream "tls" "tls-buffer" "yourserver.com" "https") |