comparison src/coding.c @ 110357:41bf9b6f3b91

Merge changes from emacs-23 branch.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 14 Sep 2010 16:41:53 +0200
parents 77fb60d4233b 3ffb3b102dae
children bec49af30c2f
comparison
equal deleted inserted replaced
110333:c2883613e1b5 110357:41bf9b6f3b91
2006 && (c == ISO_CODE_ESC || c == ISO_CODE_SI || c == ISO_CODE_SO)) 2006 && (c == ISO_CODE_ESC || c == ISO_CODE_SI || c == ISO_CODE_SO))
2007 break; 2007 break;
2008 } 2008 }
2009 else 2009 else
2010 { 2010 {
2011 int more_bytes = emacs_mule_bytes[*src_base] - 1; 2011 int more_bytes = emacs_mule_bytes[c] - 1;
2012 2012
2013 while (more_bytes > 0) 2013 while (more_bytes > 0)
2014 { 2014 {
2015 ONE_MORE_BYTE (c); 2015 ONE_MORE_BYTE (c);
2016 if (c < 0xA0) 2016 if (c < 0xA0)
4488 setup_iso_safe_charsets (attrs); 4488 setup_iso_safe_charsets (attrs);
4489 /* Charset list may have been changed. */ 4489 /* Charset list may have been changed. */
4490 charset_list = CODING_ATTR_CHARSET_LIST (attrs); 4490 charset_list = CODING_ATTR_CHARSET_LIST (attrs);
4491 coding->safe_charsets = SDATA (CODING_ATTR_SAFE_CHARSETS (attrs)); 4491 coding->safe_charsets = SDATA (CODING_ATTR_SAFE_CHARSETS (attrs));
4492 4492
4493 ascii_compatible = ! NILP (CODING_ATTR_ASCII_COMPAT (attrs)); 4493 ascii_compatible
4494 = (! NILP (CODING_ATTR_ASCII_COMPAT (attrs))
4495 && ! (CODING_ISO_FLAGS (coding) & (CODING_ISO_FLAG_DESIGNATION
4496 | CODING_ISO_FLAG_LOCKING_SHIFT)));
4494 4497
4495 while (charbuf < charbuf_end) 4498 while (charbuf < charbuf_end)
4496 { 4499 {
4497 ASSURE_DESTINATION (safe_room); 4500 ASSURE_DESTINATION (safe_room);
4498 4501