Do most of the coding system setup earlier

* src/process.c (Fmake_network_process): Set the read/write
coding systems here, so that special bindings work.
(Fmake_network_process): Complete the coding system setup here.
This commit is contained in:
Lars Ingebrigtsen 2016-02-16 13:01:05 +11:00
parent 2d7af7e206
commit 7f3441cc33
2 changed files with 5 additions and 4 deletions

View file

@ -246,7 +246,7 @@ overriding the value of `url-gateway-method'."
:type gw-method
;; Use non-blocking socket if we can.
:nowait (featurep 'make-network-process
'(:nowait t))))
'(:nowait t))))
(`socks
(socks-open-network-stream name buffer host service))
(`telnet
@ -256,6 +256,7 @@ overriding the value of `url-gateway-method'."
(_
(error "Bad setting of url-gateway-method: %s"
url-gateway-method))))))
(message "Coding system: %s" (process-coding-system conn))
conn)))
(provide 'url-gw)

View file

@ -3004,8 +3004,6 @@ void set_network_socket_coding_system (Lisp_Object proc)
}
pset_encode_coding_system (p, val);
setup_process_coding_systems (proc);
pset_decoding_buf (p, empty_unibyte_string);
p->decoding_carryover = 0;
pset_encoding_buf (p, empty_unibyte_string);
@ -3321,7 +3319,7 @@ void connect_network_socket (Lisp_Object proc, Lisp_Object ip_addresses)
if (inch > max_process_desc)
max_process_desc = inch;
set_network_socket_coding_system (proc);
setup_process_coding_systems (proc);
#ifdef HAVE_GNUTLS
/* Continue the asynchronous connection. */
@ -3897,6 +3895,8 @@ usage: (make-network-process &rest ARGS) */)
p->gnutls_boot_parameters = tem;
#endif
set_network_socket_coding_system (proc);
unbind_to (count, Qnil);
/* :server BOOL */