comparison src/coding.c @ 83518:ab6ab63755f7

Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-285 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-286 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-287 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-288 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-102 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-558
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 20 May 2006 10:32:11 +0000
parents 1321f6cfb389 576f5c8ea6e4
children 46b1096093f5
comparison
equal deleted inserted replaced
83517:b6689e223e2f 83518:ab6ab63755f7
363 Lisp_Object Qpost_read_conversion, Qpre_write_conversion; 363 Lisp_Object Qpost_read_conversion, Qpre_write_conversion;
364 Lisp_Object Qno_conversion, Qundecided; 364 Lisp_Object Qno_conversion, Qundecided;
365 Lisp_Object Qcoding_system_history; 365 Lisp_Object Qcoding_system_history;
366 Lisp_Object Qsafe_chars; 366 Lisp_Object Qsafe_chars;
367 Lisp_Object Qvalid_codes; 367 Lisp_Object Qvalid_codes;
368 Lisp_Object Qascii_incompatible;
368 369
369 extern Lisp_Object Qinsert_file_contents, Qwrite_region; 370 extern Lisp_Object Qinsert_file_contents, Qwrite_region;
370 Lisp_Object Qcall_process, Qcall_process_region; 371 Lisp_Object Qcall_process, Qcall_process_region;
371 Lisp_Object Qstart_process, Qopen_network_stream; 372 Lisp_Object Qstart_process, Qopen_network_stream;
372 Lisp_Object Qtarget_idx; 373 Lisp_Object Qtarget_idx;
3619 coding->eol_type = CODING_EOL_CR; 3620 coding->eol_type = CODING_EOL_CR;
3620 coding->common_flags 3621 coding->common_flags
3621 = CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK; 3622 = CODING_REQUIRE_DECODING_MASK | CODING_REQUIRE_ENCODING_MASK;
3622 } 3623 }
3623 else 3624 else
3624 coding->eol_type = CODING_EOL_LF; 3625 {
3626 coding->common_flags = 0;
3627 coding->eol_type = CODING_EOL_LF;
3628 }
3625 3629
3626 coding_type = XVECTOR (coding_spec)->contents[0]; 3630 coding_type = XVECTOR (coding_spec)->contents[0];
3627 /* Try short cut. */ 3631 /* Try short cut. */
3628 if (SYMBOLP (coding_type)) 3632 if (SYMBOLP (coding_type))
3629 { 3633 {
3678 /* If the coding system has non-nil `composition' property, enable 3682 /* If the coding system has non-nil `composition' property, enable
3679 composition handling. */ 3683 composition handling. */
3680 val = Fplist_get (plist, Qcomposition); 3684 val = Fplist_get (plist, Qcomposition);
3681 if (!NILP (val)) 3685 if (!NILP (val))
3682 coding->composing = COMPOSITION_NO; 3686 coding->composing = COMPOSITION_NO;
3687
3688 /* If the coding system is ascii-incompatible, record it in
3689 common_flags. */
3690 val = Fplist_get (plist, Qascii_incompatible);
3691 if (! NILP (val))
3692 coding->common_flags |= CODING_ASCII_INCOMPATIBLE_MASK;
3683 3693
3684 switch (XFASTINT (coding_type)) 3694 switch (XFASTINT (coding_type))
3685 { 3695 {
3686 case 0: 3696 case 0:
3687 coding->type = coding_type_emacs_mule; 3697 coding->type = coding_type_emacs_mule;
7818 Fput (Qchar_coding_system, Qchar_table_extra_slots, make_number (0)); 7828 Fput (Qchar_coding_system, Qchar_table_extra_slots, make_number (0));
7819 7829
7820 Qvalid_codes = intern ("valid-codes"); 7830 Qvalid_codes = intern ("valid-codes");
7821 staticpro (&Qvalid_codes); 7831 staticpro (&Qvalid_codes);
7822 7832
7833 Qascii_incompatible = intern ("ascii-incompatible");
7834 staticpro (&Qascii_incompatible);
7835
7823 Qemacs_mule = intern ("emacs-mule"); 7836 Qemacs_mule = intern ("emacs-mule");
7824 staticpro (&Qemacs_mule); 7837 staticpro (&Qemacs_mule);
7825 7838
7826 Qraw_text = intern ("raw-text"); 7839 Qraw_text = intern ("raw-text");
7827 staticpro (&Qraw_text); 7840 staticpro (&Qraw_text);