2 files changed, 27 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9f2f5d54a47..3383800fbe4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2002-06-24  Dave Love  <fx@gnu.org>
+
+        * international/characters.el: Make korean-ksc5601 double-width.
+
+        * international/mule.el (auto-coding-regexp-alist): Recognize
+        Emacs 20/1 byte-compiled files.
+
+        * international/mule-conf.el (file-coding-system-alist): Change
+        .elc to utf-8-Emacs.
+
+        * emacs-lisp/bytecomp.el (byte-recompile-directory)
+        (batch-byte-recompile-directory): Update from trunk.
+        (byte-compile-fix-header): Adjust for use of utf-8-emacs.
+        (byte-compile-insert-header): Update magic number.  Add ballast.
+        (map-char-table): Use byte-compile-funarg-2.
+
 2002-06-16  Dave Love  <fx@gnu.org>
 
         * international/mule-cmds.el (set-locale-environment): Use
diff --git a/src/ChangeLog b/src/ChangeLog
index 9e52d7fc38b..847a9b40039 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2002-06-24  Dave Love  <fx@gnu.org>
+
+        * lread.c: Remove some unused variables.
+        (safe_to_load_p): If safe, return the magic number version byte.
+        (Fload): Maybe use load-with-code-conversion.
+
 2002-06-12  Kenichi Handa  <handa@etl.go.jp>
 
         * category.c (Fmodify_category_entry): Don't modify the contents
@@ -12,14 +18,14 @@
 
         * charset.h (enum define_charset_arg_index): Delete
         charset_arg_parents and add charset_arg_subset and
-        charset_arg_superset,.
+        charset_arg_superset.
         (enum charset_attr_index): Delete charset_parents and add
         charset_subset and charset_superset.
         (enum charset_method): Delete CHARSET_METHOD_INHERIT and add
         CHARSET_METHOD_SUBSET and CHARSET_METHOD_SUPERSET.
         (CHARSET_ATTR_PARENTS, CHARSET_PARENTS): Macros deleted.
-        (CHARSET_ATTR_SUBSET, CHARSET_ATTR_SUPERSET, CHARSET_SUBSET,
-        CHARSET_SUPERSET): New macros.
+        (CHARSET_ATTR_SUBSET, CHARSET_ATTR_SUPERSET, CHARSET_SUBSET)
+        (CHARSET_SUPERSET): New macros.
         (charset_work): Extern it.
         (ENCODE_CHAR): Use charset_work.
         (CHAR_CHARSET_P): Adjusted for the change of encoder format.
@@ -89,8 +95,8 @@
         not bytecompiled now.
         (shortlisp): Likewise.
 
-        * charset.c (charset_jisx0201_roman, charset_jisx0208_1978,
-        charset_jisx0208): New variables.
+        * charset.c (charset_jisx0201_roman, charset_jisx0208_1978)
+        (charset_jisx0208): New variables.
         (Fdefine_charset_internal): Setup them if appropriate.
         (init_charset_once): Initialize them to -1.