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 /doc | |
| parent | ba05d005e5a81bc123ad8da928b1bccb6b160e7a (diff) | |
| parent | 74a77ef299f3703b8b9eac7579af6b924de1c3e8 (diff) | |
| download | emacs-8bc552ffa53936f9fa1517c30d5057be80d09ca4.tar.gz | |
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 'doc')
| -rw-r--r-- | doc/lispref/processes.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 0f713bcae20..535cebed7a8 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -3111,7 +3111,8 @@ signaled. Call @code{puny-encode-domain} on @var{name} first if you wish to lookup internationalized hostnames. If successful it returns a list of Lisp representations of network -addresses, otherwise it returns @code{nil}. +addresses, otherwise it returns @code{nil}. In the latter case, it +also displays the error message hopefully explaining what went wrong. By default both IPv4 and IPv6 lookups are attempted. The optional argument @var{family} controls this behavior, specifying the symbol |