diff options
| -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 |