comparison src/fileio.c @ 80312:339dff977be0

(Finsert_file_contents): Don't make CCL program to append "CCL: Quitted" when the decoding is quitted, but just signal `quit'.
author Kenichi Handa <handa@m17n.org>
date Mon, 10 Mar 2008 12:19:35 +0000
parents 7a2d0126392f
children c7ecb287a9ca
comparison
equal deleted inserted replaced
80311:23dc6fc4bf91 80312:339dff977be0
4630 4630
4631 if (inserted > 0 || coding.type == coding_type_ccl) 4631 if (inserted > 0 || coding.type == coding_type_ccl)
4632 { 4632 {
4633 if (CODING_MAY_REQUIRE_DECODING (&coding)) 4633 if (CODING_MAY_REQUIRE_DECODING (&coding))
4634 { 4634 {
4635 if (coding.type == coding_type_ccl)
4636 coding.spec.ccl.decoder.quit_silently = 1;
4635 code_convert_region (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted, 4637 code_convert_region (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
4636 &coding, 0, 0); 4638 &coding, 0, 0);
4639 if (coding.type == coding_type_ccl)
4640 coding.spec.ccl.decoder.quit_silently = 0;
4641 if (coding.result == CODING_FINISH_INTERRUPT)
4642 {
4643 /* Fixme: It is better that we report that the decoding
4644 was interruppted by the user, and the current buffer
4645 contents doesn't reflect the file correctly. */
4646 Fsignal (Qquit, Qnil);
4647 }
4637 inserted = coding.produced_char; 4648 inserted = coding.produced_char;
4638 } 4649 }
4639 else 4650 else
4640 adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted, 4651 adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
4641 inserted); 4652 inserted);