[Emacs-diffs] Changes to emacs/src/fileio.c,v [EMACS_22_BASE]

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Kenichi Handa <handa>   08/03/10 12:19:35

Index: fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.580.2.11
retrieving revision 1.580.2.12
diff -u -b -r1.580.2.11 -r1.580.2.12
--- fileio.c    7 Mar 2008 15:42:30 -0000       1.580.2.11
+++ fileio.c    10 Mar 2008 12:19:35 -0000      1.580.2.12
@@ -4632,8 +4632,19 @@
     {
       if (CODING_MAY_REQUIRE_DECODING (&coding))
        {
+         if (coding.type == coding_type_ccl)
+           coding.spec.ccl.decoder.quit_silently = 1;
          code_convert_region (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
                               &coding, 0, 0);
+         if (coding.type == coding_type_ccl)
+           coding.spec.ccl.decoder.quit_silently = 0;
+         if (coding.result == CODING_FINISH_INTERRUPT)
+           {
+             /* Fixme: It is better that we report that the decoding
+                was interruppted by the user, and the current buffer
+                contents doesn't reflect the file correctly.  */
+             Fsignal (Qquit, Qnil);
+           }
          inserted = coding.produced_char;
        }
       else