(cl-macro-environment): Don't define it here.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b04653de7c0e95a63b580db7dc4c7d9bce6519d4..d85a0433fd891647756ef6d79e77f4d4ebca61c8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2009-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/cl.el (cl-macro-environment): Don't define it here.
+
        * emacs-lisp/checkdoc.el (checkdoc-force-history-flag):
        Change default, since most of our files don't have a history.
        (checkdoc-display-status-buffer): Don't use a hidden buffer to show to

diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index beed29678d4889974cb798100d22f771a040e31b..2045a05a97a5229bfe20d3ee27ff54257e7acf37 100644 (file)
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -246,7 +246,7 @@ one value."
 
 ;;; Macros.
 
-(defvar cl-macro-environment nil)
+(defvar cl-macro-environment)
 (defvar cl-old-macroexpand (prog1 (symbol-function 'macroexpand)
                             (defalias 'macroexpand 'cl-macroexpand)))