comparison src/fileio.c @ 38973:64125d607a06

Finsert_file_contents): Allocate, restore, and free composition data in the case of REPLACE not being nil.

38972:4459c45545d0

		}

	      /* Convert this batch with results in CONVERSION_BUFFER.  */
	      if (how_much >= total)  /* This is the last block.  */
		coding.mode |= CODING_MODE_LAST_BLOCK;
	      result = decode_coding (&coding, read_buf,
				      conversion_buffer + inserted,
				      this, bufsize - inserted);

	      /* Save for next iteration whatever we didn't convert.  */

	}
      /* Insert from the file at the proper position.  */
      SET_PT_BOTH (temp, same_at_start);
      insert_1 (conversion_buffer + same_at_start - BEG_BYTE, inserted,
		0, 0, 0);
      /* Set `inserted' to the number of inserted characters.  */
      inserted = PT - temp;

      xfree (conversion_buffer);
      emacs_close (fd);

38973:64125d607a06

		}

	      /* Convert this batch with results in CONVERSION_BUFFER.  */
	      if (how_much >= total)  /* This is the last block.  */
		coding.mode |= CODING_MODE_LAST_BLOCK;
	      if (coding.composing != COMPOSITION_DISABLED)
		coding_allocate_composition_data (&coding, BEGV);
	      result = decode_coding (&coding, read_buf,
				      conversion_buffer + inserted,
				      this, bufsize - inserted);

	      /* Save for next iteration whatever we didn't convert.  */

	}
      /* Insert from the file at the proper position.  */
      SET_PT_BOTH (temp, same_at_start);
      insert_1 (conversion_buffer + same_at_start - BEG_BYTE, inserted,
		0, 0, 0);
      if (coding.cmp_data && coding.cmp_data->used)
	coding_restore_composition (&coding, Fcurrent_buffer ());
      coding_free_composition_data (&coding);
  
      /* Set `inserted' to the number of inserted characters.  */
      inserted = PT - temp;

      xfree (conversion_buffer);
      emacs_close (fd);