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 /src/eval.c | |
| 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 'src/eval.c')
| -rw-r--r-- | src/eval.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/eval.c b/src/eval.c index 6c912bc4762..c01dd09199f 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1751,9 +1751,9 @@ find_handler_clause (Lisp_Object handlers, Lisp_Object conditions) | |||
| 1751 | } | 1751 | } |
| 1752 | 1752 | ||
| 1753 | 1753 | ||
| 1754 | /* Dump an error message; called like vprintf. */ | 1754 | /* Format and return a string; called like vprintf. */ |
| 1755 | void | 1755 | Lisp_Object |
| 1756 | verror (const char *m, va_list ap) | 1756 | vformat_string (const char *m, va_list ap) |
| 1757 | { | 1757 | { |
| 1758 | char buf[4000]; | 1758 | char buf[4000]; |
| 1759 | ptrdiff_t size = sizeof buf; | 1759 | ptrdiff_t size = sizeof buf; |
| @@ -1767,7 +1767,14 @@ verror (const char *m, va_list ap) | |||
| 1767 | if (buffer != buf) | 1767 | if (buffer != buf) |
| 1768 | xfree (buffer); | 1768 | xfree (buffer); |
| 1769 | 1769 | ||
| 1770 | xsignal1 (Qerror, string); | 1770 | return string; |
| 1771 | } | ||
| 1772 | |||
| 1773 | /* Dump an error message; called like vprintf. */ | ||
| 1774 | void | ||
| 1775 | verror (const char *m, va_list ap) | ||
| 1776 | { | ||
| 1777 | xsignal1 (Qerror, vformat_string (m, ap)); | ||
| 1771 | } | 1778 | } |
| 1772 | 1779 | ||
| 1773 | 1780 | ||