From: Kenichi Handa <handa@m17n.org>
Date: Wed, 29 Sep 2004 23:51:34 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~4753
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=07c381ad19a0b780e7d3d54a25244967fb00d7fa;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4cb7ad9d501..73fb09883eb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,13 +1,16 @@
 2004-09-30  Kenichi Handa  <handa@m17n.org>
 
-	* process.c (send_process): Be sure to free composition data.
+	* process.c (send_process): Free composition data.
 
-	* fileio.c (Finsert_file_contents): Be sure to free composition
-	data.
+	* fileio.c (Finsert_file_contents): Free composition data.
 
 	* coding.c (code_convert_region): Don't skip ASCIIs if there are
-	compositions to encode.  Be sure to free composition data.
-	(encode_coding_string): Likewise.
+	compositions to encode.
+	(encode_coding_string): Likewise.  Free composition data.
+
+2004-09-30  Florian Weimer <fw@deneb.enyo.de>	(tiny change)
+
+	* coding.c (code_convert_region): Free composition data.
 
 2004-09-29  Kim F. Storm  <storm@cua.dk>
 
diff --git a/src/callproc.c b/src/callproc.c
index c3345eb3707..effd7ecbb14 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -807,6 +807,8 @@ usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS)  */)
 		  {
 		    detect_coding (&process_coding, bufptr, nread);
 		    if (process_coding.composing != COMPOSITION_DISABLED)
+		      /* We have not yet allocated the composition
+			 data because the coding type was undecided.  */
 		      coding_allocate_composition_data (&process_coding, PT);
 		  }
 		if (process_coding.cmp_data)