From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 19 Feb 2016 00:58:50 +0000 (+1100)
Subject: Fix coding system setup
X-Git-Tag: emacs-26.0.90~2520^2~7
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b73e5254ea9056ee2088ed096ef1de3ef8699855;p=emacs.git

Fix coding system setup

* src/process.c (set_network_socket_coding_system): Pass in
the host/service that's been computed already.
---

diff --git a/src/process.c b/src/process.c
index 4a11e7f8b8f..a59e4182e4c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2945,19 +2945,17 @@ usage:  (make-serial-process &rest ARGS)  */)
   return proc;
 }
 
-void set_network_socket_coding_system (Lisp_Object proc)
+void set_network_socket_coding_system (Lisp_Object proc,
+				       Lisp_Object host,
+				       Lisp_Object service,
+				       Lisp_Object name)
 {
   Lisp_Object tem;
   struct Lisp_Process *p = XPROCESS (proc);
   Lisp_Object contact = p->childp;
-  Lisp_Object service, host, name;
   Lisp_Object coding_systems = Qt;
   Lisp_Object val;
 
-  service = Fplist_get (contact, QCservice);
-  host = Fplist_get (contact, QChost);
-  name = Fplist_get (contact, QCname);
-
   tem = Fplist_member (contact, QCcoding);
   if (!NILP (tem) && (!CONSP (tem) || !CONSP (XCDR (tem))))
     tem = Qnil;  /* No error message (too late!).  */
@@ -3931,7 +3929,7 @@ usage: (make-network-process &rest ARGS)  */)
   p->gnutls_boot_parameters = tem;
 #endif
 
-  set_network_socket_coding_system (proc);
+  set_network_socket_coding_system (proc, service, host, name);
 
   unbind_to (count, Qnil);