Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-138
   Update from CVS

 * miles@gnu.org--gnu-2003/emacs--cvs-trunk--0--patch-139
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-15

1 files changed, 4 insertions, 1 deletions

diff --git a/src/coding.c b/src/coding.c
index 910fc8faa68..3f11c6f41fb 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -2125,7 +2125,10 @@ decode_coding_iso2022 (coding, source, destination, src_bytes, dst_bytes)
                           && src + 1 < src_end
                           && src[0] == '%'
                           && src[1] == '@')
-                        break;
+                        {
+                          src += 2;
+                          break;
+                        }
                       d += CHAR_STRING (c1, d), produced_chars++;
                     }
                   if (d + 3 > (dst_bytes ? dst_end : src))