diff options
| author | John Paul Wallington <jpw@pobox.com> | 2008-05-17 00:04:07 +0000 |
|---|---|---|
| committer | John Paul Wallington <jpw@pobox.com> | 2008-05-17 00:04:07 +0000 |
| commit | 1915fb444e02acabc2c76147502b525960095b5c (patch) | |
| tree | 6af11fc55acbc3dd39b13bc4f29959b5790ab882 /lisp | |
| parent | 7c2ec3f97517f249902d26040e2f571852a4791b (diff) | |
| download | emacs-1915fb444e02acabc2c76147502b525960095b5c.tar.gz | |
(top-level): Revert previous change: require cl when compiling.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc-dispatcher.el | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 17f42d14d5d..0404a51edff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,4 +1,8 @@ -<<<<<<< ChangeLog +2008-05-16 John Paul Wallington <jpw@pobox.com> + + * vc-dispatcher.el (top-level): Revert previous change: require cl + when compiling. + 2008-05-16 Eric S. Raymond <esr@snark.thyrsus.com> * vc.el (vc-default-status-printer) diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el index f9ff4ba1480..b257025d501 100644 --- a/lisp/vc-dispatcher.el +++ b/lisp/vc-dispatcher.el @@ -122,8 +122,10 @@ (require 'ewoc) -;; General customization +(eval-when-compile + (require 'cl)) +;; General customization (defcustom vc-logentry-check-hook nil "Normal hook run by `vc-finish-logentry'. Use this to impose your own rules on the entry in addition to any the |