Load cl here since cc-defs doesn't do it. This is necessary for

derived modes.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 223224d42ab95bdb933181639c0dd49ba88d8057..35fc88ca1da30acac2ea69d4cd11af2baacef5b8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-01  Martin Stjernholm  <bug-cc-mode@gnu.org>
+
+       * progmodes/cc-langs.el: Load cl here since cc-defs doesn't do it.
+       This is necessary for derived modes.
+
 2004-09-30  Kim F. Storm  <storm@cua.dk>
 
        * kmacro.el (kmacro-lambda-form, kmacro-extract-lambda): Add.

diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 6aeb70ba4e3d8449e8d5dd5b383371209fbb6594..6a36f89c8d3dce70f5be1970e2fc5a1a4280b4e8 100644 (file)
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -124,6 +124,9 @@
 (cc-require 'cc-defs)
 (cc-require 'cc-vars)
 
+;; This file is not always loaded.  See note above.
+(cc-external-require 'cl)
+
 \f
 ;;; Setup for the `c-lang-defvar' system.