comparison src/process.c @ 20433:a43789debf48

(read_process_output): Fix previous change, i.e, if proc_encode_coding_system[p->outfd] is NULL, instead of allocating `struct coding_system' for encoding, just skip setting up coding system for encoding. Set Vlast_coding_system_used after some text is read. (send_process): Set Vlast_coding_system_used after deciding a coding system to be used for encoding.

20432:987ddd5cb6ee

	  /* Don't call setup_coding_system for
             proc_decode_coding_system[channel] here.  It is done in
             detect_coding called via decode_coding above.  */

	  /* If coding-system for encoding is not yet decided, we set it
	     as the same as coding-system for decoding.  */
	  if (NILP (p->encode_coding_system))
	    {
	      p->encode_coding_system = coding->symbol;
	      if (!proc_encode_coding_system[p->outfd])
		proc_encode_coding_system[p->outfd]
		  = ((struct coding_system *)
		     xmalloc (sizeof (struct coding_system)));
	      setup_coding_system (coding->symbol,
				   proc_encode_coding_system[p->outfd]);
	    }
	}
#ifdef VMS

      free (chars);
      chars = XSTRING (p->decoding_buf)->data;
      chars_in_decoding_buf = 1;
    }
#endif

  outstream = p->filter;
  if (!NILP (outstream))
    {
      /* We inhibit quit here instead of just catching it so that 

    error ("Process %s not running", procname);
  if (XINT (XPROCESS (proc)->outfd) < 0)
    error ("Output file descriptor of %s is closed", procname);

  coding = proc_encode_coding_system[XINT (XPROCESS (proc)->outfd)];
  if (CODING_REQUIRE_ENCODING (coding))
    {
      int require = encoding_buffer_size (coding, len);
      int offset, dummy;
      unsigned char *temp_buf = NULL;

20433:a43789debf48

	  /* Don't call setup_coding_system for
             proc_decode_coding_system[channel] here.  It is done in
             detect_coding called via decode_coding above.  */

	  /* If coding-system for encoding is not yet decided, we set
	     it as the same as coding-system for decoding.

	     But, before doing that we must check if
	     proc_encode_coding_system[p->outfd] surely points to a
	     valid memory because p->outfd will be changed once EOF is
	     sent to the process.  */
	  if (NILP (p->encode_coding_system)
	      && proc_encode_coding_system[p->outfd])
	    {
	      p->encode_coding_system = coding->symbol;
	      setup_coding_system (coding->symbol,
				   proc_encode_coding_system[p->outfd]);
	    }
	}
#ifdef VMS

      free (chars);
      chars = XSTRING (p->decoding_buf)->data;
      chars_in_decoding_buf = 1;
    }
#endif

  Vlast_coding_system_used = coding->symbol;

  outstream = p->filter;
  if (!NILP (outstream))
    {
      /* We inhibit quit here instead of just catching it so that 

    error ("Process %s not running", procname);
  if (XINT (XPROCESS (proc)->outfd) < 0)
    error ("Output file descriptor of %s is closed", procname);

  coding = proc_encode_coding_system[XINT (XPROCESS (proc)->outfd)];
  Vlast_coding_system_used = coding->symbol;

  if (CODING_REQUIRE_ENCODING (coding))
    {
      int require = encoding_buffer_size (coding, len);
      int offset, dummy;
      unsigned char *temp_buf = NULL;