Merge from emacs--rel--22

Patches applied:

 * emacs--rel--22  (patch 43-44)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 229)

   - Merge from emacs--devo--0, emacs--rel--22

2007-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>

   * lisp/font-lock.el (font-lock-add-keywords): In case font-lock was only
   half-activated, forcefully activate it completely.

2007-06-11  Richard M. Stallman  <rms@gnu.org>

   * lisp/cus-edit.el (custom-variable-type): Doc fix.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-797

1 files changed, 9 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfe2b2ee82d..d30fbe87852 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -212,6 +212,15 @@
 
 2007-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * font-lock.el (font-lock-add-keywords): In case font-lock was only
+        half-activated, forcefully activate it completely.
+
+2007-06-11  Richard Stallman  <rms@gnu.org>
+
+        * cus-edit.el (custom-variable-type): Doc fix.
+
+2007-06-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
         * progmodes/sh-script.el (sh-font-lock-backslash-quote)
         (sh-font-lock-flush-syntax-ppss-cache): New functions.
         (sh-font-lock-syntactic-keywords): Use them to distinguish the