Show
Ignore:
Timestamp:
05/18/06 16:19:18 (3 years ago)
Author:
miyoshi
Message:

Sync up with Emacs CVS HEAD.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/src/coding.c

    r4079 r4085  
    364364Lisp_Object Qsafe_chars; 
    365365Lisp_Object Qvalid_codes; 
     366Lisp_Object Qascii_incompatible; 
    366367 
    367368extern Lisp_Object Qinsert_file_contents, Qwrite_region; 
    …… 
    36263627    } 
    36273628  else 
    3628     coding->eol_type = CODING_EOL_LF; 
     3629    { 
     3630      coding->common_flags = 0; 
     3631      coding->eol_type = CODING_EOL_LF; 
     3632    } 
    36293633 
    36303634  coding_type = XVECTOR (coding_spec)->contents[0]; 
    …… 
    36853689  if (!NILP (val)) 
    36863690    coding->composing = COMPOSITION_NO; 
     3691 
     3692  /* If the coding system is ascii-incompatible, record it in 
     3693     common_flags.   */ 
     3694  val = Fplist_get (plist, Qascii_incompatible); 
     3695  if (! NILP (val)) 
     3696    coding->common_flags |= CODING_ASCII_INCOMPATIBLE_MASK; 
    36873697 
    36883698  switch (XFASTINT (coding_type)) 
    …… 
    78337843  staticpro (&Qvalid_codes); 
    78347844 
     7845  Qascii_incompatible = intern ("ascii-incompatible"); 
     7846  staticpro (&Qascii_incompatible); 
     7847 
    78357848  Qemacs_mule = intern ("emacs-mule"); 
    78367849  staticpro (&Qemacs_mule);