(auto-coding-alist): Use

no-conversion-multibyte for archive files.

3 files changed, 25 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 958b01e475a..770aebf8a5f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-16  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule.el (auto-coding-alist): Use
+        no-conversion-multibyte for archive files.
+
 2008-03-16  Glenn Morris  <rgm@gnu.org>
 
         * calendar/diary-lib.el (calendar-mark-complex, calendar-mark-1):
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index d6305814a09..732c58367b3 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1578,8 +1578,10 @@ text, and convert it in the temporary buffer.  Otherwise, convert in-place."
   ;; .exe and .EXE are added to support archive-mode looking at DOS
   ;; self-extracting exe archives.
   '(("\\.\\(\
-arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|exe\\|rar\\|\
-ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|EXE\\|RAR\\)\\'" . no-conversion)
+arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|\
+ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'"
+     . no-conversion-multibyte)
+    ("\\.\\(exe\\|EXE\\)\\'" . no-conversion)
     ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion)
     ("\\.\\(gz\\|Z\\|bz\\|bz2\\|gpg\\)\\'" . no-conversion)
     ("\\.\\(jpe?g\\|png\\|gif\\|tiff?\\|p[bpgn]m\\)\\'" . no-conversion)
diff --git a/src/ChangeLog b/src/ChangeLog
index c8989be51ed..687951808f3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
+2008-03-16  Kenichi Handa  <handa@m17n.org>
+
+        * coding.c (CHAR_STRING_ADVANCE_NO_UNIFY)
+        (STRING_CHAR_ADVANCE_NO_UNIFY): New macros.
+        (coding_alloc_by_making_gap): Fix the way to preserve data in the
+        gap.
+        (alloc_destination): Fix the 2nd arg to
+        coding_alloc_by_making_gap.
+        (encode_coding_utf_8): Use CHAR_STRING_ADVANCE_NO_UNIFY instead of
+        CHAR_STRING_ADVANCE.
+        (produce_chars): Fix for the case that the source and the
+        destination are the same buffer.  Use CHAR_STRING_ADVANCE_NO_UNIFY
+        instead of CHAR_STRING_ADVANCE.
+        (consume_chars): Use STRING_CHAR_ADVANCE_NO_UNIFY instead of
+        STRING_CHAR_ADVANCE.
+
 2008-03-15  Andreas Schwab  <schwab@suse.de>
 
         * regex.c (re_match_2_internal): Correct matching of eight bit