2 files changed, 15 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index eb4768379b3..132f1b08c1b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,20 @@
 2000-08-04  Kenichi Handa  <handa@etl.go.jp>
 
+        * process.c (read_process_output): Big simplification.  Handle
+        composition and post-read-conversion of coding system correctly.
+        (send_process): Handle composition correctly.
+
+        * callproc.c (Fcall_process): Handle post-read-conversion of
+        coding system if any.
+
         * coding.c (decode_coding_iso2022): More strict check for handling
         single shifting.
+        (coding_restore_composition): Pay attention to the case that
+        cmp_data is not set properly (because of invalid code in the
+        source text).
+        (run_pre_post_conversion_on_str): Include text properties in the
+        resulting string.
+        (decode_coding_string): Set members of coding correctly.
 
 2000-08-03  Gerd Moellmann  <gerd@gnu.org>
 
diff --git a/src/process.c b/src/process.c
index ce6ea82cffa..540b10681a5 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2952,6 +2952,7 @@ read_process_output (proc, channel)
 
       text = decode_coding_string (make_unibyte_string (chars, nbytes),
                                    coding, 0);
+      Vlast_coding_system_used = coding->symbol;
       /* A new coding system might be found.  */
       if (!EQ (p->decode_coding_system, coding->symbol))
         {
@@ -3064,6 +3065,7 @@ read_process_output (proc, channel)
          the buffer's mark is, and the user's next command is Meta-y.  */
       text = decode_coding_string (make_unibyte_string (chars, nbytes),
                                    coding, 0);
+      Vlast_coding_system_used = coding->symbol;
       /* A new coding system might be found.  See the comment in the
          similar code in the previous `if' block.  */
       if (!EQ (p->decode_coding_system, coding->symbol))