diff options
| author | Kenichi Handa <handa@m17n.org> | 2004-09-29 23:51:34 +0000 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2004-09-29 23:51:34 +0000 |
| commit | 07c381ad19a0b780e7d3d54a25244967fb00d7fa (patch) | |
| tree | c86d9888f0be8f290bc626776cc52fc089cdff18 | |
| parent | 9de36315db6feb975f19b3a01c5883a56f2b1fe9 (diff) | |
| download | emacs-07c381ad19a0b780e7d3d54a25244967fb00d7fa.tar.gz emacs-07c381ad19a0b780e7d3d54a25244967fb00d7fa.tar.bz2 emacs-07c381ad19a0b780e7d3d54a25244967fb00d7fa.zip | |
*** empty log message ***
| -rw-r--r-- | src/ChangeLog | 13 | ||||
| -rw-r--r-- | src/callproc.c | 2 |
2 files changed, 10 insertions, 5 deletions
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) |