mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-04-06 22:31:13 -07:00
Merge branch 'master' into feature/igc
This commit is contained in:
commit
c19d702b3b
146 changed files with 2274 additions and 1059 deletions
|
|
@ -3368,7 +3368,7 @@ finish_after_tls_connection (Lisp_Object proc)
|
|||
Lisp_Object result = Qt;
|
||||
|
||||
if (!NILP (Ffboundp (Qnsm_verify_connection)))
|
||||
result = call3 (Qnsm_verify_connection,
|
||||
result = calln (Qnsm_verify_connection,
|
||||
proc,
|
||||
plist_get (contact, QChost),
|
||||
plist_get (contact, QCservice));
|
||||
|
|
@ -4964,7 +4964,7 @@ server_accept_connection (Lisp_Object server, int channel)
|
|||
{
|
||||
int code = errno;
|
||||
if (!would_block (code) && !NILP (ps->log))
|
||||
call3 (ps->log, server, Qnil,
|
||||
calln (ps->log, server, Qnil,
|
||||
concat3 (build_string ("accept failed with code"),
|
||||
Fnumber_to_string (make_fixnum (code)),
|
||||
build_string ("\n")));
|
||||
|
|
@ -5126,7 +5126,7 @@ server_accept_connection (Lisp_Object server, int channel)
|
|||
if (!NILP (ps->log))
|
||||
{
|
||||
AUTO_STRING (accept_from, "accept from ");
|
||||
call3 (ps->log, server, proc, concat3 (accept_from, host_string, nl));
|
||||
calln (ps->log, server, proc, concat3 (accept_from, host_string, nl));
|
||||
}
|
||||
|
||||
AUTO_STRING (open_from, "open from ");
|
||||
|
|
@ -8471,7 +8471,7 @@ See `process-attributes' for getting attributes of a process given its ID. */)
|
|||
= Ffind_file_name_handler (BVAR (current_buffer, directory),
|
||||
Qlist_system_processes);
|
||||
if (!NILP (handler))
|
||||
return call1 (handler, Qlist_system_processes);
|
||||
return calln (handler, Qlist_system_processes);
|
||||
|
||||
return list_system_processes ();
|
||||
}
|
||||
|
|
@ -8535,7 +8535,7 @@ integer or floating point values.
|
|||
= Ffind_file_name_handler (BVAR (current_buffer, directory),
|
||||
Qprocess_attributes);
|
||||
if (!NILP (handler))
|
||||
return call2 (handler, Qprocess_attributes, pid);
|
||||
return calln (handler, Qprocess_attributes, pid);
|
||||
|
||||
return system_process_attributes (pid);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue