mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-22 05:31:01 -08:00
Code Issues Projects Releases Wiki Activity

Merge changes from emacs-23 branch.

Browse source
This commit is contained in:
Juanma Barranquero 2010-09-14 16:41:53 +02:00
commit 6664fc59a8
24 changed files with 459 additions and 194 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/coding.c
View file

@ -2008,7 +2008,7 @@ detect_coding_emacs_mule (struct coding_system *coding,
}
else
{
int more_bytes = emacs_mule_bytes[*src_base] - 1;
int more_bytes = emacs_mule_bytes[c] - 1;
while (more_bytes > 0)
{
@ -4490,7 +4490,10 @@ encode_coding_iso_2022 (struct coding_system *coding)
charset_list = CODING_ATTR_CHARSET_LIST (attrs);
coding->safe_charsets = SDATA (CODING_ATTR_SAFE_CHARSETS (attrs));
ascii_compatible = ! NILP (CODING_ATTR_ASCII_COMPAT (attrs));
ascii_compatible
= (! NILP (CODING_ATTR_ASCII_COMPAT (attrs))
&& ! (CODING_ISO_FLAGS (coding) & (CODING_ISO_FLAG_DESIGNATION
| CODING_ISO_FLAG_LOCKING_SHIFT)));
while (charbuf < charbuf_end)
{