diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:14:58 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-01-01 01:14:58 -0800 |
| commit | 8bc552ffa53936f9fa1517c30d5057be80d09ca4 (patch) | |
| tree | 29097047634cc76f1b3aea76a15334d8bf156f5d /src | |
| parent | ba05d005e5a81bc123ad8da928b1bccb6b160e7a (diff) | |
| parent | 74a77ef299f3703b8b9eac7579af6b924de1c3e8 (diff) | |
Merge from origin/emacs-27
74a77ef299 Improve documentation of 'network-lookup-address-info'
c6d5555646 Display messages sent using ERC's /say
c156723769 Fix Rmail summary display when From: header is malformed
Diffstat (limited to 'src')
| -rw-r--r-- | src/process.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c index 31591416898..eaa7fa14651 100644 --- a/src/process.c +++ b/src/process.c @@ -4587,12 +4587,13 @@ network_lookup_address_info_1 (Lisp_Object host, const char *service, DEFUN ("network-lookup-address-info", Fnetwork_lookup_address_info, Snetwork_lookup_address_info, 1, 2, 0, - doc: /* Look up ip address info of NAME. + doc: /* Look up Internet Protocol (IP) address info of NAME. Optional parameter FAMILY controls whether to look up IPv4 or IPv6 addresses. The default of nil means both, symbol `ipv4' means IPv4 only, symbol `ipv6' means IPv6 only. Returns a list of addresses, or nil if none were found. Each address is a vector of integers, as per -the description of ADDRESS in `make-network-process'. */) +the description of ADDRESS in `make-network-process'. In case of +error displays the error message. */) (Lisp_Object name, Lisp_Object family) { Lisp_Object addresses = Qnil; |