diff options
-rw-r--r-- | lisp/ChangeLog | 2 | ||||
-rw-r--r-- | lisp/emacs-lisp/cl.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b04653de7c0..d85a0433fd8 100644 --- 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 beed29678d4..2045a05a97a 100644 --- 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))) |