(font-lock): Add jit-lock as explicit group member.

(jit-lock): Group declaration moved to jit-lock.el.
(toplevel): Don't explicitly require jit-lock, since it's autoloaded
when necessary.

2 files changed, 21 insertions, 19 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f5aece0510..8c6ec64fc4f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,12 +1,24 @@
+2004-01-26  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * font-lock.el (font-lock): Add jit-lock as explicit group member.
+        (jit-lock): Group declaration moved to jit-lock.el.
+        (toplevel): Don't explicitly require jit-lock, since it's autoloaded
+        when necessary.
+
+        * jit-lock.el (jit-lock): Move group declaration from font-lock.el.
+        (jit-lock-context-unfontify-pos): Rename from
+        jit-lock-first-unfontify-pos.
+        (jit-lock-defer-buffers): Rename from jit-lock-buffers.
+
 2004-01-25  Glenn Morris  <gmorris@ast.cam.ac.uk>
 
-        * progmodes/fortran.el (fortran-break-before-delimiters): Doc fix. 
-        (fortran-break-delimiters-re, fortran-no-break-re): New defconsts.
+        * progmodes/fortran.el (fortran-break-before-delimiters): Doc fix.
+        (fortran-break-delimiters-re, fortran-no-break-re): New consts.
         (fortran-fill): When filling a string, adjust re-search-backward
         argument for special case of string just on fill-column.
         When filling non-string, allow one extra char if
-        fortran-break-before-delimiters is non-nil.  Suggested by
-        Michael Hagemann <michael.hagemann@unibas.ch>. 
+        fortran-break-before-delimiters is non-nil.
+        Suggested by Michael Hagemann <michael.hagemann@unibas.ch>.
         Use fortran-break-delimiters-re and fortran-no-break-re to
         correctly handle cases such as "**".
 
@@ -41,16 +53,16 @@
 
 2004-01-22  Kenichi Handa  <handa@m17n.org>
 
-        * language/cyrillic.el (ccl-encode-windows-1251-font): Rearrange
-        code point (register r1) only for charset mule-unicode-0100-24ff.
+        * language/cyrillic.el (ccl-encode-windows-1251-font): Rearrange code
+        point (register r1) only for charset mule-unicode-0100-24ff.
 
 2004-01-21  Markus Rost  <rost@mathematik.uni-bielefeld.de>
 
         * mail/rmail.el (rmail-convert-to-babyl-format): Avoid deleting
         trailing white space and ensure a final newline.
 
-        * mail/rmail-spam-filter.el (rmail-use-spam-filter): Add autoload
-        cookie.
+        * mail/rmail-spam-filter.el (rmail-use-spam-filter):
+        Add autoload cookie.
 
 2004-01-21  Benjamin Rutt  <brutt@bloomington.in.us>
 
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index b76c818a517..c7cd817b4f1 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -210,7 +210,7 @@
 (require 'syntax)
 
 ;; Define core `font-lock' group.
-(defgroup font-lock nil
+(defgroup font-lock '((jit-lock custom-group))
   "Font Lock mode text highlighting package."
   :link '(custom-manual "(emacs)Font Lock")
   :link '(custom-manual "(elisp)Font Lock Mode")
@@ -237,13 +237,6 @@
   :link '(custom-manual "(emacs)Support Modes")
   :load 'lazy-lock
   :group 'font-lock)
-
-(defgroup jit-lock nil
-  "Font Lock support mode to fontify just-in-time."
-  :link '(custom-manual "(emacs)Support Modes")
-  :version "21.1"
-  :load 'jit-lock
-  :group 'font-lock)
 
 ;; User variables.
 
@@ -1927,8 +1920,5 @@ This function could be MATCHER in a MATCH-ANCHORED `font-lock-keywords' item."
 
 (provide 'font-lock)
 
-(when (eq font-lock-support-mode 'jit-lock-mode)
-  (require 'jit-lock))
-
 ;;; arch-tag: 682327e4-64d8-4057-b20b-1fbb9f1fc54c
 ;;; font-lock.el ends here