From: Martin Stjernholm <mast@lysator.liu.se>
Date: Fri, 1 Oct 2004 15:37:39 +0000 (+0000)
Subject: Load cl here since cc-defs doesn't do it.  This is necessary for
X-Git-Tag: ttn-vms-21-2-B4~4748
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9a737a1f155b9a2d3e2438a0ea416024f6d374db;p=emacs.git

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 223224d42ab..35fc88ca1da 100644
--- 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 6aeb70ba4e3..6a36f89c8d3 100644
--- 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)
+
 
 ;;; Setup for the `c-lang-defvar' system.