2 files changed, 22 insertions, 0 deletions

diff --git a/etc/TODO b/etc/TODO
index a123ce43f22..826987d429a 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -68,6 +68,11 @@ Other features we would like:
   of commands which could be replaced with a simpler common command.
   It should not make more than one suggestion per 10 minutes.
 
+* Add a way to define input methods by computing them (when first used)
+  from other input methods.  Then redefine C-x 8 to use a
+  user-selected input method, with the default being the union of
+  latin-1-prefix and latin-1-postfix.
+
 * Implement a clean way to use different major modes for
   different parts of a buffer.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0236e3a0093..2d46ec19e84 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2002-06-21  Richard M. Stallman  <rms@gnu.org>
+
+        * net/browse-url.el (browse-url-at-mouse): Don't pass an arg
+        to browse-url-at-point.
+
+        * play/zone.el (zone-idle): Var deleted.
+
+        * international/iso-acc.el (iso-languages) <french>:
+        `~ ' now generates `~', `~,' definition deleted.
+
+        * format.el (format-annotate-function): Copy multibyte flag
+        and selective-display into the new temp buffer.
+
+        * edmacro.el (edmacro-fix-menu-commands):
+        Discard `help-echo' events.  Handle (menu-bar) events.
+        Simplify by converting key sequence to a list and then back to vector.
+        
 2002-06-21  Andreas Schwab  <schwab@suse.de>
 
         * files.el (find-file-read-args): Add new argument `mustmatch' and