Merge from emacs--rel--22

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1bcc372a619fa75ca9f53d7b83a69a21b57f821c..f623747209f4de6545999f9346116139d439b725 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,18 @@
+2007-12-05  Richard Stallman  <rms@gnu.org>
+
+       * wid-edit.el (widget-type): Doc fix.
+
+2007-12-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/perl-mode.el (perl-font-lock-syntactic-keywords):
+       Don't match "sub { (...) ... }".
+
+2007-12-05  Richard Stallman  <rms@gnu.org>
+
+       * international/mule-cmds.el (toggle-input-method-active): New var.
+       (toggle-input-method): Bind toggle-input-method-active to t.
+       Error if it was already non-nil.
+
 2007-12-05  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * net/tls.el (tls-hostmismatch, open-tls-stream): Checkdoc cleanup.