Merge from trunk.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/process.c b/src/process.c
index 08da53b4a40..a8088322147 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5161,6 +5161,9 @@ read_process_output (Lisp_Object proc, register int channel)
           p->decoding_carryover = coding->carryover_bytes;
         }
       if (SBYTES (text) > 0)
+        /* FIXME: It's wrong to wrap or not based on debug-on-error, and
+           sometimes it's simply wrong to wrap (e.g. when called from
+           accept-process-output).  */
         internal_condition_case_1 (read_process_output_call,
                                    Fcons (outstream,
                                           Fcons (proc, Fcons (text, Qnil))),